Skip to content

Commit 6ee4979

Browse files
williambohrmann3duffh
williambohrmann3
and
duffh
authored
200.5.0 (#1503)
Co-authored-by: Hamish Duff <[email protected]>
1 parent 66a97ad commit 6ee4979

File tree

93 files changed

+2855
-940
lines changed

Some content is hidden

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

93 files changed

+2855
-940
lines changed

‎src/Directory.Packages.props

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<ArcGISMapsSDKVersion Condition="'$(ArcGISMapsSDKVersion)'==''">200.4.0</ArcGISMapsSDKVersion>
4+
<ArcGISMapsSDKVersion Condition="'$(ArcGISMapsSDKVersion)'==''">200.5.0</ArcGISMapsSDKVersion>
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageVersion Include="Esri.ArcGISRuntime" Version="$(ArcGISMapsSDKVersion)" />
@@ -15,24 +15,24 @@
1515
<PackageVersion Include="Esri.ArcGISRuntime.UWP" Version="$(ArcGISMapsSDKVersion)" />
1616
<PackageVersion Include="Esri.ArcGISRuntime.Toolkit.UWP" Version="$(ArcGISMapsSDKVersion)" />
1717
<PackageVersion Include="Esri.ArcGISRuntime.Toolkit.WinUI" Version="$(ArcGISMapsSDKVersion)" />
18-
<PackageVersion Include="Markdig" Version="0.30.4" />
19-
<PackageVersion Include="System.Text.Json" Version="7.0.1" />
20-
<PackageVersion Include="System.Speech" Version="7.0.0" />
21-
<PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
22-
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="7.0.0" />
18+
<PackageVersion Include="Markdig" Version="0.37.0" />
19+
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
20+
<PackageVersion Include="System.Speech" Version="8.0.0" />
21+
<PackageVersion Include="System.Drawing.Common" Version="8.0.6" />
22+
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
2323
<PackageVersion Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
2424
<PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
25-
<PackageVersion Include="CommunityToolkit.Maui" Version="5.0.0" />
26-
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.1.0" />
27-
<PackageVersion Include="WinUIEx" Version="1.8.0" />
28-
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" Condition="'$(UseMaui)'!='true'" />
29-
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" Condition="'$(UseMaui)'!='true'" />
25+
<PackageVersion Include="CommunityToolkit.Maui" Version="9.0.1" />
26+
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
27+
<PackageVersion Include="WinUIEx" Version="2.3.4" />
28+
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240607001" Condition="'$(UseMaui)'!='true'" />
29+
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" Condition="'$(UseMaui)'!='true'" />
3030
<PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13" />
3131
<PackageVersion Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="6.1.1" />
3232
<PackageVersion Include="Microsoft.UI.Xaml" Version="2.5.0" />
3333
<PackageVersion Include="Monaco.Editor" Version="0.8.1-alpha" />
34-
<PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.6" />
35-
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.6" />
34+
<PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.70" />
35+
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
3636
<PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.3" />
3737
</ItemGroup>
3838
</Project>

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

-6
Original file line numberDiff line numberDiff line change
@@ -100,24 +100,18 @@
100100
<EmbeddedResource Include="SyntaxHighlighting\highlight.js" />
101101
</ItemGroup>
102102
<ItemGroup>
103-
<MauiImage Include="Resources\Thumbnails\placeholder_android.jpg" />
104103
<None Remove="Resources\Icons\*.svg" />
105104
<MauiImage Include="Resources\Icons\*.svg" />
106105
</ItemGroup>
107106

108107
<ItemGroup>
109108
<None Remove="Resources\Fonts\calcite-ui-icons-24.ttf" />
110109
</ItemGroup>
111-
<ItemGroup>
112-
<MauiImage Include="Resources\Thumbnails\placeholder_ios.jpg" />
113-
<MauiImage Include="Resources\Thumbnails\placeholder_maccatalyst.jpg" />
114-
</ItemGroup>
115110
<ItemGroup>
116111
<EmbeddedResource Include="Resources\PictureMarkerSymbols\pin_blue.png" />
117112
<EmbeddedResource Include="Resources\PictureMarkerSymbols\pin_star_blue.png" />
118113
</ItemGroup>
119114
<ItemGroup>
120-
<MauiAsset Include="Resources\Thumbnails\placeholder_windows.jpg" />
121115
<MauiAsset Include="SyntaxHighlighting\github-markdown.css">
122116
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
123117
</MauiAsset>

‎src/MAUI/Maui.Samples/Helpers/ArcGISLoginPrompt.cs

+2-22
Original file line numberDiff line numberDiff line change
@@ -70,28 +70,8 @@ public static async Task<bool> EnsureAGOLCredentialAsync()
7070

7171
public static void SetChallengeHandler()
7272
{
73-
// Define the server information for ArcGIS Online
74-
ServerInfo portalServerInfo = new ServerInfo(new Uri(ArcGISOnlineUrl))
75-
{
76-
TokenAuthenticationType = TokenAuthenticationType.OAuthAuthorizationCode,
77-
OAuthClientInfo = new OAuthClientInfo(AppClientId, new Uri(OAuthRedirectUrl))
78-
};
79-
80-
// If a client secret has been configured, set the authentication type to OAuth client credentials.
81-
if (!string.IsNullOrEmpty(ClientSecret))
82-
{
83-
// If a client secret is specified then use the TokenAuthenticationType.OAuthClientCredentials type.
84-
portalServerInfo.TokenAuthenticationType = TokenAuthenticationType.OAuthClientCredentials;
85-
portalServerInfo.OAuthClientInfo.ClientSecret = ClientSecret;
86-
}
87-
88-
// Register this server with AuthenticationManager.
89-
AuthenticationManager.Current.RegisterServer(portalServerInfo);
90-
91-
// Use a function in this class to challenge for credentials.
92-
AuthenticationManager.Current.ChallengeHandler = new ChallengeHandler(PromptCredentialAsync);
93-
94-
// Set the OAuthAuthorizeHandler component (this class) for Android or iOS platforms.
73+
var userConfig = new OAuthUserConfiguration(new Uri(ArcGISOnlineUrl), AppClientId, new Uri(OAuthRedirectUrl));
74+
AuthenticationManager.Current.OAuthUserConfigurations.Add(userConfig);
9575
AuthenticationManager.Current.OAuthAuthorizeHandler = new OAuthAuthorize();
9676
}
9777

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

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ public partial class App : MauiWinUIApplication
1414
/// </summary>
1515
public App()
1616
{
17+
if (WinUIEx.WebAuthenticator.CheckOAuthRedirectionActivation())
18+
return;
1719
this.InitializeComponent();
1820
}
1921

‎src/MAUI/Maui.Samples/Resources/Thumbnails/Placeholder_Android.jpg

-10.7 KB
Binary file not shown.

‎src/MAUI/Maui.Samples/Resources/Thumbnails/Placeholder_MacCatalyst.jpg

-28.2 KB
Binary file not shown.

‎src/MAUI/Maui.Samples/Resources/Thumbnails/Placeholder_Windows.jpg

-28.2 KB
Binary file not shown.

‎src/MAUI/Maui.Samples/Resources/Thumbnails/Placeholder_iOS.jpg

-90.3 KB
Binary file not shown.

‎src/MAUI/Maui.Samples/Samples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.xaml

+110-87
Original file line numberDiff line numberDiff line change
@@ -16,97 +16,120 @@
1616
<Grid>
1717
<esriUI:MapView x:Name="MyMapView" GeoViewTapped="MyMapView_GeoViewTapped" />
1818
<Grid Margin="5,5,5,5"
19-
ColumnDefinitions="auto, auto"
2019
ColumnSpacing="5"
2120
HorizontalOptions="End"
22-
RowDefinitions="auto, auto, auto, auto, auto, auto, auto"
21+
RowDefinitions="auto,*"
2322
RowSpacing="5"
24-
VerticalOptions="Start">
25-
<Button x:Name="PointButton"
23+
VerticalOptions="Start"
24+
WidthRequest="150">
25+
<Button x:Name="ToggleGeometryEditorPanelButton"
2626
Grid.Row="0"
27-
Clicked="PointButton_Click"
28-
Style="{StaticResource IconStyle}"
29-
Text="&#xe21c;"
30-
ToolTipProperties.Text="Point" />
31-
<Button x:Name="MultipointButton"
32-
Grid.Row="0"
33-
Grid.Column="1"
34-
Clicked="MultipointButton_Click"
35-
FontSize="15"
36-
Style="{StaticResource IconStyle}"
37-
Text="&#xe21c;&#xe21c;"
38-
ToolTipProperties.Text="Multipoint" />
39-
<Button x:Name="PolylineButton"
40-
Grid.Row="1"
41-
Clicked="PolylineButton_Click"
42-
Style="{StaticResource IconStyle}"
43-
Text="&#xe1a8;"
44-
ToolTipProperties.Text="Polyline / no shape fill" />
45-
<Button x:Name="PolygonButton"
46-
Grid.Row="1"
47-
Grid.Column="1"
48-
Clicked="PolygonButton_Click"
49-
Style="{StaticResource IconStyle}"
50-
Text="&#xe220;"
51-
ToolTipProperties.Text="Polygon / shape fill" />
52-
<Border Grid.Row="2"
53-
Grid.ColumnSpan="2"
54-
BackgroundColor="{AppThemeBinding Light={StaticResource White},
55-
Dark={StaticResource Dark}}">
56-
<Picker x:Name="ToolPicker"
57-
SelectedIndexChanged="ToolPicker_SelectedIndexChanged"
58-
ToolTipProperties.Text="Tools"
59-
WidthRequest="150" />
60-
</Border>
61-
<HorizontalStackLayout Grid.Row="3"
62-
Grid.ColumnSpan="2"
63-
Padding="1"
64-
Background="{AppThemeBinding Light={StaticResource White},
65-
Dark={StaticResource Dark}}">
66-
<CheckBox x:Name="UniformScaleCheckBox" CheckedChanged="CheckBox_CheckedChanged" />
67-
<Label Text="Uniform Scale" VerticalOptions="Center" />
68-
</HorizontalStackLayout>
69-
<Button Grid.Row="4"
70-
Clicked="UndoButton_Click"
71-
IsEnabled="{Binding GeometryEditor.CanUndo, Source={x:Reference MyMapView}}"
72-
Style="{StaticResource IconStyle}"
73-
Text="&#xe2d6;"
74-
ToolTipProperties.Text="Undo" />
75-
<Button Grid.Row="4"
76-
Grid.Column="1"
77-
Clicked="RedoButton_Click"
78-
IsEnabled="{Binding GeometryEditor.CanRedo, Source={x:Reference MyMapView}}"
79-
Style="{StaticResource IconStyle}"
80-
Text="&#xe23e;"
81-
ToolTipProperties.Text="Redo" />
82-
<Button Grid.Row="5"
83-
Clicked="DeleteSelectedButton_Click"
84-
IsEnabled="{Binding GeometryEditor.SelectedElement.CanDelete, Source={x:Reference MyMapView}, FallbackValue=False}"
85-
Style="{StaticResource IconStyle}"
86-
Text="&#xe0e8;"
87-
ToolTipProperties.Text="Delete selected" />
88-
<Button x:Name="SaveButton"
89-
Grid.Row="5"
90-
Grid.Column="1"
91-
Clicked="SaveButton_Click"
92-
IsEnabled="{Binding GeometryEditor.CanUndo, Source={x:Reference MyMapView}}"
93-
Style="{StaticResource IconStyle}"
94-
Text="&#xe06f;"
95-
ToolTipProperties.Text="Save edits" />
96-
<Button Grid.Row="6"
97-
Clicked="DiscardButton_Click"
98-
IsEnabled="{Binding GeometryEditor.IsStarted, Source={x:Reference MyMapView}}"
99-
Style="{StaticResource IconStyle}"
100-
Text="&#xe080;"
101-
ToolTipProperties.Text="Discard edits" />
102-
<Button x:Name="DeleteAllButton"
103-
Grid.Row="6"
104-
Grid.Column="1"
105-
Clicked="DeleteAllButton_Click"
106-
IsEnabled="{Binding GeometryEditor.IsStarted, Source={x:Reference MyMapView}, Converter={StaticResource InvertedBoolConverter}}"
107-
Style="{StaticResource IconStyle}"
108-
Text="&#xe2d0;"
109-
ToolTipProperties.Text="Delete all geometries" />
27+
HorizontalOptions="Fill"
28+
Pressed="ToggleGeometryEditorPanelButton_Pressed"
29+
Text="Show UI" />
30+
<ScrollView x:Name="GeometryEditorPanel"
31+
Grid.Row="1"
32+
IsVisible="False"
33+
MaximumHeightRequest="400">
34+
<Grid ColumnDefinitions="auto, auto"
35+
ColumnSpacing="5"
36+
RowDefinitions="auto, auto, auto, auto, auto, auto, auto"
37+
RowSpacing="5">
38+
<Button x:Name="PointButton"
39+
Grid.Row="0"
40+
Clicked="PointButton_Click"
41+
Style="{StaticResource IconStyle}"
42+
Text="&#xe21c;"
43+
ToolTipProperties.Text="Point" />
44+
<Button x:Name="MultipointButton"
45+
Grid.Row="0"
46+
Grid.Column="1"
47+
Clicked="MultipointButton_Click"
48+
FontSize="15"
49+
Style="{StaticResource IconStyle}"
50+
Text="&#xe21c;&#xe21c;"
51+
ToolTipProperties.Text="Multipoint" />
52+
<Button x:Name="PolylineButton"
53+
Grid.Row="1"
54+
Clicked="PolylineButton_Click"
55+
Style="{StaticResource IconStyle}"
56+
Text="&#xe1a8;"
57+
ToolTipProperties.Text="Polyline / no shape fill" />
58+
<Button x:Name="PolygonButton"
59+
Grid.Row="1"
60+
Grid.Column="1"
61+
Clicked="PolygonButton_Click"
62+
Style="{StaticResource IconStyle}"
63+
Text="&#xe220;"
64+
ToolTipProperties.Text="Polygon / shape fill" />
65+
<Border Grid.Row="2"
66+
Grid.ColumnSpan="2"
67+
BackgroundColor="{AppThemeBinding Light={StaticResource White},
68+
Dark={StaticResource Dark}}">
69+
<Picker x:Name="ToolPicker"
70+
SelectedIndexChanged="ToolPicker_SelectedIndexChanged"
71+
ToolTipProperties.Text="Tools"
72+
WidthRequest="150" />
73+
</Border>
74+
<Border Grid.Row="3"
75+
Grid.ColumnSpan="2"
76+
Padding="5"
77+
Background="{AppThemeBinding Light={StaticResource White},
78+
Dark={StaticResource Dark}}">
79+
<Border.StrokeShape>
80+
<RoundRectangle CornerRadius="5" />
81+
</Border.StrokeShape>
82+
<HorizontalStackLayout>
83+
<CheckBox x:Name="UniformScaleCheckBox"
84+
Margin="3,0,5,0"
85+
CheckedChanged="CheckBox_CheckedChanged" />
86+
<Label Text="Uniform Scale" VerticalOptions="Center" />
87+
</HorizontalStackLayout>
88+
</Border>
89+
<Button Grid.Row="4"
90+
Clicked="UndoButton_Click"
91+
IsEnabled="{Binding GeometryEditor.CanUndo, Source={x:Reference MyMapView}}"
92+
Style="{StaticResource IconStyle}"
93+
Text="&#xe2d6;"
94+
ToolTipProperties.Text="Undo" />
95+
<Button Grid.Row="4"
96+
Grid.Column="1"
97+
Clicked="RedoButton_Click"
98+
IsEnabled="{Binding GeometryEditor.CanRedo, Source={x:Reference MyMapView}}"
99+
Style="{StaticResource IconStyle}"
100+
Text="&#xe23e;"
101+
ToolTipProperties.Text="Redo" />
102+
<Button Grid.Row="5"
103+
Clicked="DeleteSelectedButton_Click"
104+
IsEnabled="{Binding GeometryEditor.SelectedElement.CanDelete, Source={x:Reference MyMapView}, FallbackValue=False}"
105+
Style="{StaticResource IconStyle}"
106+
Text="&#xe0e8;"
107+
ToolTipProperties.Text="Delete selected" />
108+
<Button x:Name="SaveButton"
109+
Grid.Row="5"
110+
Grid.Column="1"
111+
Clicked="SaveButton_Click"
112+
IsEnabled="{Binding GeometryEditor.CanUndo, Source={x:Reference MyMapView}}"
113+
Style="{StaticResource IconStyle}"
114+
Text="&#xe06f;"
115+
ToolTipProperties.Text="Save edits" />
116+
<Button Grid.Row="6"
117+
Clicked="DiscardButton_Click"
118+
IsEnabled="{Binding GeometryEditor.IsStarted, Source={x:Reference MyMapView}}"
119+
Style="{StaticResource IconStyle}"
120+
Text="&#xe080;"
121+
ToolTipProperties.Text="Discard edits" />
122+
<Button x:Name="DeleteAllButton"
123+
Grid.Row="6"
124+
Grid.Column="1"
125+
Clicked="DeleteAllButton_Click"
126+
IsEnabled="{Binding GeometryEditor.IsStarted, Source={x:Reference MyMapView}, Converter={StaticResource InvertedBoolConverter}}"
127+
Style="{StaticResource IconStyle}"
128+
Text="&#xe2d0;"
129+
ToolTipProperties.Text="Delete all geometries" />
130+
</Grid>
131+
</ScrollView>
110132
</Grid>
133+
111134
</Grid>
112135
</ContentPage>

0 commit comments

Comments
 (0)