Skip to content

Commit a638c33

Browse files
imalcolm1arcgis-maps-sdk-bot
authored andcommitted
[MAUI] Calcite integration (#1683)
1 parent 54b9c82 commit a638c33

Some content is hidden

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

43 files changed

+159
-342
lines changed

src/Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageVersion Include="Esri.ArcGISRuntime.WinUI" Version="$(ArcGISMapsSDKVersion)" />
1313
<PackageVersion Include="Esri.ArcGISRuntime.Hydrography" Version="$(ArcGISMapsSDKVersion)" />
1414
<PackageVersion Include="Esri.ArcGISRuntime.Toolkit.WinUI" Version="$(ArcGISMapsSDKVersion)" />
15-
<PackageVersion Include="Esri.Calcite.Maui" Version="0.1.0-preview1" />
15+
<PackageVersion Include="Esri.Calcite.Maui" Version="1.0.0-rc.1" />
1616
<PackageVersion Include="Esri.Calcite.WinUI" Version="1.0.0-rc.1" />
1717
<PackageVersion Include="Markdig" Version="0.37.0" />
1818
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3537.50" />

src/MAUI/Maui.Samples/App.xaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@
88
<ResourceDictionary.MergedDictionaries>
99
<ResourceDictionary Source="Resources/Styles/Colors.xaml" />
1010
<ResourceDictionary Source="Resources/Styles/Styles.xaml" />
11+
<CalciteResources xmlns="http://schemas.esri.com/calcite/2024"/>
12+
<ResourceDictionary>
13+
<!-- Override calcite brand colors: -->
14+
<Color x:Key="CalciteBrandDarkColor">#8F53CA</Color>
15+
<Color x:Key="CalciteBrandLightColor">#7938B6</Color>
16+
<Color x:Key="CalciteBrandHoverDarkColor">#7938B6</Color>
17+
<Color x:Key="CalciteBrandHoverLightColor">#652E98</Color>
18+
<Color x:Key="CalciteBrandPressDarkColor">#652E98</Color>
19+
<Color x:Key="CalciteBrandPressLightColor">#51247A</Color>
20+
21+
<Color x:Key="SamplesViewerBannerColor">#7938B6</Color>
22+
</ResourceDictionary>
1123
</ResourceDictionary.MergedDictionaries>
1224
</ResourceDictionary>
1325
</Application.Resources>

src/MAUI/Maui.Samples/Controls/CategoriesFlyoutContent.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</HorizontalStackLayout.Triggers>
2828
<Label Margin="20,0"
2929
FontFamily="CalciteUIIconsMediumFontFamily"
30-
FontSize="25"
30+
FontSize="24"
3131
Text="{Binding CategoryIcon}"
3232
TextColor="White"
3333
VerticalOptions="Center" />

src/MAUI/Maui.Samples/Resources/Icons/applications.svg

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)