Skip to content

Commit 0329b73

Browse files
ShaliniSF79ShaliniSF79
committed
changes
1 parent d8eaa8b commit 0329b73

File tree

6 files changed

+53
-1
lines changed

6 files changed

+53
-1
lines changed

‎maui/samples/Gallery/ControlList.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<Assembly Name="BottomSheet" />
1919
<Assembly Name="NumericEntry" />
2020
<Assembly Name="NumericUpDown" />
21-
<Assembly Name="Calendar" />
21+
<Assembly Name="Expander" />
22+
<Assembly Name="Calendar" />
23+
<Assembly Name="Accordion" />
2224
</Assemblies>
2325
</SampleBrowser>

‎maui/samples/Gallery/Resources/Styles/SampleBrowserStyles.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<Color x:Key="TileHeaderBackgroundDark">#2A2831</Color>
4343
<Color x:Key="TextColourAlt1Dark">#CAC4D0</Color>
4444
<Color x:Key="TileTextColourAlt1Dark">#CAC4D0</Color>
45+
<Color x:Key="TileTextColourAlt1">#CAC4D0</Color>
4546
<Color x:Key="IconColourDark">#CAC4D0</Color>
4647
<Color x:Key="PlaceholderTextColourDark">#CAC4D0</Color>
4748
<Color x:Key="PrimaryBackgroundDark">#D0BCFF</Color>

‎maui/samples/Gallery/Syncfusion.Maui.ControlsGallery.csproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,15 @@
9292
</ItemGroup>
9393

9494
<ItemGroup>
95+
<EmbeddedResource Include="SampleList\AccordionSamplesList.xml" />
9596
<EmbeddedResource Include="SampleList\ButtonsSamplesList.xml" />
9697
<EmbeddedResource Include="SampleList\CalendarSamplesList.xml" />
9798
<EmbeddedResource Include="SampleList\CarouselSamplesList.xml" />
9899
<EmbeddedResource Include="SampleList\CartesianChartSamplesList.xml" />
99100
<EmbeddedResource Include="SampleList\ChipsSamplesList.xml" />
100101
<EmbeddedResource Include="SampleList\CircularChartSamplesList.xml" />
101102
<EmbeddedResource Include="SampleList\EffectsViewSamplesList.xml" />
103+
<EmbeddedResource Include="SampleList\ExpanderSamplesList.xml" />
102104
<EmbeddedResource Include="SampleList\FunnelChartSamplesList.xml" />
103105
<EmbeddedResource Include="SampleList\NavigationDrawerSamplesList.xml" />
104106
<EmbeddedResource Include="SampleList\BottomSheetSamplesList.xml" />
@@ -116,5 +118,14 @@
116118
<ItemGroup>
117119
<ProjectReference Include="..\..\src\Syncfusion.Maui.Toolkit.csproj" />
118120
</ItemGroup>
121+
122+
<ItemGroup>
123+
<MauiXaml Update="Samples\Accordion\GettingStarted\View\AccordionGettingStarted.xaml">
124+
<Generator>MSBuild:Compile</Generator>
125+
</MauiXaml>
126+
<MauiXaml Update="Samples\Expander\GettingStarted\View\ExpanderGettingStarted.xaml">
127+
<Generator>MSBuild:Compile</Generator>
128+
</MauiXaml>
129+
</ItemGroup>
119130

120131
</Project>

‎maui/src/AssemblyInfo.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
using System.Runtime.CompilerServices;
22

33
[assembly: InternalsVisibleTo("Syncfusion.Maui.Toolkit.UnitTest")]
4+
[assembly: XmlnsDefinition("http://schemas.syncfusion.com/maui/toolkit", "Syncfusion.Maui.Toolkit.Accordion")]
45
[assembly: XmlnsDefinition("http://schemas.syncfusion.com/maui/toolkit", "Syncfusion.Maui.Toolkit.BottomSheet")]
56
[assembly: XmlnsDefinition("http://schemas.syncfusion.com/maui/toolkit", "Syncfusion.Maui.Toolkit.Buttons")]
67
[assembly: XmlnsDefinition("http://schemas.syncfusion.com/maui/toolkit", "Syncfusion.Maui.Toolkit.Calendar")]
78
[assembly: XmlnsDefinition("http://schemas.syncfusion.com/maui/toolkit", "Syncfusion.Maui.Toolkit.Carousel")]
89
[assembly: XmlnsDefinition("http://schemas.syncfusion.com/maui/toolkit", "Syncfusion.Maui.Toolkit.Charts")]
910
[assembly: XmlnsDefinition("http://schemas.syncfusion.com/maui/toolkit", "Syncfusion.Maui.Toolkit.Chips")]
1011
[assembly: XmlnsDefinition("http://schemas.syncfusion.com/maui/toolkit", "Syncfusion.Maui.Toolkit.EffectsView")]
12+
[assembly: XmlnsDefinition("http://schemas.syncfusion.com/maui/toolkit", "Syncfusion.Maui.Toolkit.Expander")]
1113
[assembly: XmlnsDefinition("http://schemas.syncfusion.com/maui/toolkit", "Syncfusion.Maui.Toolkit.NavigationDrawer")]
1214
[assembly: XmlnsDefinition("http://schemas.syncfusion.com/maui/toolkit", "Syncfusion.Maui.Toolkit.NumericEntry")]
1315
[assembly: XmlnsDefinition("http://schemas.syncfusion.com/maui/toolkit", "Syncfusion.Maui.Toolkit.NumericUpDown")]

‎maui/src/Core/Theme/Resources/DefaultTheme.xaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,29 @@
9292
<local:StaticThemeResource x:Key="SfPullToRefreshProgressBackground" ResourceKey="ContentBackgroundAlt2" />
9393
<local:StaticThemeResource x:Key="SfPullToRefreshProgressColor" ResourceKey="PrimaryBackground" />
9494
<sys:Double x:Key="SfPullToRefreshProgressThickness">3</sys:Double>
95+
96+
<!--SfExpander-->
97+
<x:String x:Key="SfExpanderTheme">CommonTheme</x:String>
98+
<local:StaticThemeResource x:Key="SfExpanderNormalHeaderBackground" ResourceKey="Transparent" />
99+
<local:StaticThemeResource x:Key="SfExpanderHoverHeaderBackground" ResourceKey="ContentBackgroundHovered" />
100+
<local:StaticThemeResource x:Key="SfExpanderHeaderRippleBackground" ResourceKey="ContentForeground" />
101+
<local:StaticThemeResource x:Key="SfExpanderNormalHeaderIconColor" ResourceKey="IconColor" />
102+
<local:StaticThemeResource x:Key="SfExpanderHoverHeaderIconColor" ResourceKey="IconColorHovered" />
103+
<local:StaticThemeResource x:Key="SfExpanderPressedHeaderIconColor" ResourceKey="IconColorPressed" />
104+
105+
<!--SfAccordion-->
106+
<x:String x:Key="SfAccordionTheme">CommonTheme</x:String>
107+
<local:StaticThemeResource x:Key="SfAccordionNormalHeaderIconColor" ResourceKey="IconColor" />
108+
<local:StaticThemeResource x:Key="SfAccordionHoverHeaderIconColor" ResourceKey="IconColorHovered" />
109+
<local:StaticThemeResource x:Key="SfAccordionPressedHeaderIconColor" ResourceKey="IconColorPressed" />
110+
<local:StaticThemeResource x:Key="SfAccordionFocusedHeaderIconColor" ResourceKey="IconColorPressed" />
111+
<local:StaticThemeResource x:Key="SfAccordionExpandedItemStroke" ResourceKey="Border" />
112+
<sys:Double x:Key="SfAccordionExpandedItemStrokeThickness">1</sys:Double>
113+
<local:StaticThemeResource x:Key="SfAccordionNormalHeaderBackground" ResourceKey="Transparent" />
114+
<local:StaticThemeResource x:Key="SfAccordionHoverHeaderBackground" ResourceKey="ContentBackgroundHovered" />
115+
<local:StaticThemeResource x:Key="SfAccordionFocusedHeaderBackground" ResourceKey="ContentBackgroundFocused" />
116+
<local:StaticThemeResource x:Key="SfAccordionHeaderRippleBackground" ResourceKey="ContentForeground" />
117+
<local:StaticThemeResource x:Key="SfAccordionFocusedItemStroke" ResourceKey="BorderAlt4" />
95118

96119
<!--SfTabView-->
97120
<x:String x:Key="SfTabViewTheme">CommonTheme</x:String>

‎maui/src/Syncfusion.Maui.Toolkit.csproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@
101101
<MauiXaml Remove="Carousel\Platform\Windows\Styles\Resources.xaml" />
102102
</ItemGroup>
103103

104+
<ItemGroup>
105+
<MauiFont Include="Resources\Fonts\MauiMaterialAssets.ttf" />
106+
</ItemGroup>
107+
104108
<ItemGroup>
105109
<None Include="..\..\LICENSE.txt" Link="LICENSE.txt" Pack="true" PackagePath="" />
106110
<None Include="..\..\syncfusion_logo.png" Link="syncfusion_logo.png" Pack="true" PackagePath="" />
@@ -116,4 +120,13 @@
116120
</Page>
117121
</ItemGroup>
118122

123+
<ItemGroup>
124+
<MauiXaml Update="Themes\SfAccordionStyles.xaml">
125+
<Generator>MSBuild:Compile</Generator>
126+
</MauiXaml>
127+
<MauiXaml Update="Themes\SfExpanderStyles.xaml">
128+
<Generator>MSBuild:Compile</Generator>
129+
</MauiXaml>
130+
</ItemGroup>
131+
119132
</Project>

0 commit comments

Comments
 (0)