Skip to content

Commit 19e67e0

Browse files
committed
conflicts resolved
2 parents 2cb2d64 + 27abb71 commit 19e67e0

File tree

86 files changed

+5294
-156
lines changed

Some content is hidden

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

86 files changed

+5294
-156
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ The Syncfusion® Toolkit is built with community collaboration in mind, aiming t
4545
| | Text Input Layout | Enhances input fields with floating labels and validation, improving user interaction. |
4646
| | Expander | Allows users to expand or collapse content dynamically, improving space management and user experience. |
4747
| | Accordion | Organizes content into multiple expandable sections, allowing only one section to be open at a time for better navigation and space management.|
48+
| | Cards | Create dismissible cards or a stack of cards, and customize their background, borders, and corners. |
4849
| Buttons | Chips | Interactive tags for filtering, labeling, or visual options, perfect for e-commerce or task management. |
4950
| | Segmented Control | Quickly switch between views or categories, ideal for apps with multiple layout options. |
5051
| | Button | Customizable button control with icon support, background images, and visual state styling. |

maui/samples/Gallery/ControlList.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@
2121
<Assembly Name="Expander" />
2222
<Assembly Name="Calendar" />
2323
<Assembly Name="Accordion" />
24+
<Assembly Name="Cards" />
2425
</Assemblies>
2526
</SampleBrowser>
30.4 KB
Loading
41.1 KB
Loading
3.79 KB
Loading
1.75 KB
Loading
31.8 KB
Loading
41.3 KB
Loading
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<SyncfusionControls>
3+
<ControlCategory Name="Layouts">
4+
<Control Title="Cards"
5+
Image="cards.png"
6+
ControlName="SfCards"
7+
Description="A container control that allows users to create dismissible cards or a stack of cards.">
8+
<Sample Title="Card view" SampleName="CardView"/>
9+
</Control>
10+
</ControlCategory>
11+
</SyncfusionControls>

maui/samples/Gallery/Samples/Calendar/AppearanceCustomization/ViewModel/AppearanceViewModel.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Microsoft.Maui.Controls.Shapes;
2+
using Syncfusion.Maui.Toolkit.Calendar;
23
using System.ComponentModel;
34
using System.Globalization;
45
using System.Xml;
@@ -50,7 +51,10 @@ public AppearanceViewModel()
5051
border.Stroke = _isLightTheme ? Color.FromRgba("#6750A4") : Color.FromRgba("#D0BCFF");
5152

5253
Label label = new Label();
53-
label.SetBinding(Label.TextProperty, "Date.Day");
54+
label.SetBinding(Label.TextProperty, BindingHelper.CreateBinding(
55+
propertyName: "Date.Day",
56+
getter: static (CalendarCellDetails context) => context.Date.Day));
57+
5458
label.HorizontalOptions = LayoutOptions.Center;
5559
label.VerticalOptions = LayoutOptions.Center;
5660
label.Padding = new Thickness(2);
@@ -77,7 +81,10 @@ public AppearanceViewModel()
7781
border.Stroke = _isLightTheme ? Color.FromRgba("#6750A4") : Color.FromRgba("#D0BCFF");
7882

7983
Label label = new Label();
80-
label.SetBinding(Label.TextProperty, "Date.Day");
84+
label.SetBinding(Label.TextProperty, BindingHelper.CreateBinding(
85+
propertyName: "Date.Day",
86+
getter: static (CalendarCellDetails context) => context.Date.Day));
87+
8188
label.HorizontalOptions = LayoutOptions.Center;
8289
label.VerticalOptions = LayoutOptions.Center;
8390
border.Content = label;

0 commit comments

Comments
 (0)