Skip to content

Commit 42ea6b0

Browse files
MuniappanSubramanianMuniappanSubramanian
committed
Merge branch 'internal_public' of https://github.com/syncfusion/maui-toolkit into internal_public
2 parents 662a08b + 0176192 commit 42ea6b0

Some content is hidden

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

44 files changed

+852
-394
lines changed

‎maui/samples/Gallery/Converters/StringToVisibilityConverter .cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using System.Globalization;
2+
3+
namespace Syncfusion.Maui.ControlsGallery.Converters
4+
{
5+
public class StringToVisibilityConverter : IValueConverter
6+
{
7+
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
8+
{
9+
return !string.IsNullOrEmpty(value as string);
10+
}
11+
12+
public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
13+
{
14+
return null;
15+
}
16+
17+
}
18+
}

‎maui/samples/Gallery/Samples/CartesianChart/BoxAndWhisker/BoxAndWhisker.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
HorizontalOptions="Fill" VerticalOptions="Start"
5858
SelectedIndex="0"
5959
SelectedIndexChanged="ModePicker_SelectedIndexChanged"
60-
BackgroundColor="{AppThemeBinding Light={StaticResource BackgroundLight}, Dark={StaticResource BackgroundDark}}"
61-
TextColor="{AppThemeBinding Light={StaticResource TextColourLight}, Dark={StaticResource TextColourDark}}"
60+
Background="{OnPlatform Default={AppThemeBinding Dark={StaticResource TextColour1Dark}, Light={StaticResource BackgroundLight}},Android=Transparent}"
61+
TextColor="{OnPlatform Default={StaticResource TextColourLight}, Android={AppThemeBinding Light={StaticResource TextColourLight}, Dark={StaticResource TextColourDark}}}"
6262
></Picker>
6363
</HorizontalStackLayout>
6464
</VerticalStackLayout>

‎maui/samples/Gallery/Samples/CartesianChart/DataLabel/DataLabelTemplate.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
<chart:SfCartesianChart.Resources>
1818
<local:DoubleToFontIconConverter x:Key="doubleToFontIconConverter"/>
1919

20-
<DataTemplate x:Key="labelTemplate">
20+
<DataTemplate x:Key="labelTemplate" x:DataType="chart:ChartDataLabel">
2121
<Grid ColumnSpacing="2" ColumnDefinitions="Auto,Auto" RowDefinitions="{OnPlatform MacCatalyst='20', iOS='20'}" Margin="{OnPlatform MacCatalyst='0, 0, 0, 10', Android='0, 0, 0, -5'}">
2222
<!--<Image WidthRequest="30" HeightRequest="30" HorizontalOptions="Start" VerticalOptions="Start" Source="{Binding Item.GrossLastYearDelta, Converter={StaticResource doubleToFontIconConverter}, ConverterParameter='image'}"/>-->
23-
<Label Grid.Column="0" FontSize="{OnPlatform MacCatalyst='50', WinUI='Large', Default='40'}" Margin="{OnPlatform WinUI='-4', Default='-4,-4,-10, -4'}" Text="{Binding Item.GrossLastYearDelta, Converter={StaticResource doubleToFontIconConverter}, ConverterParameter='icon'}"
24-
TextColor="{Binding Item.GrossLastYearDelta, Converter={StaticResource doubleToFontIconConverter}, ConverterParameter='image'}"
23+
<Label Grid.Column="0" FontSize="{OnPlatform MacCatalyst='50', WinUI='Large', Default='40'}" Margin="{OnPlatform WinUI='-4', Default='-4,-4,-10, -4'}" Text="{Binding Item, Converter={StaticResource doubleToFontIconConverter}, ConverterParameter='icon'}"
24+
TextColor="{Binding Item, Converter={StaticResource doubleToFontIconConverter}, ConverterParameter='image'}"
2525
FontFamily="MauiSampleFontIcon" VerticalOptions="Center">
2626
</Label>
27-
<Label Grid.Column="1" Text="{Binding Item.GrossLastYearDelta, StringFormat='{0:0.###}%'}" FontSize="{OnPlatform Default='14', MacCatalyst='16'}"
27+
<Label Grid.Column="1" Text="{Binding Item,Converter={StaticResource doubleToFontIconConverter},ConverterParameter='GrossLastYearDelta', StringFormat='{0:0.###}%'}" FontSize="{OnPlatform Default='14', MacCatalyst='16'}"
2828
VerticalTextAlignment="Center" HorizontalOptions="Start" VerticalOptions="Center" >
2929
</Label>
3030
</Grid>

‎maui/samples/Gallery/Samples/CartesianChart/DataLabel/DataLabelTemplate.xaml.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,19 @@ public class DoubleToFontIconConverter : IValueConverter
3636
{
3737
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
3838
{
39-
if (value is not double || parameter is not string para)
40-
{
39+
if (parameter is not string para)
4140
return null;
42-
}
4341

44-
var doubleValue = (double)value;
42+
double doubleValue = 0;
43+
44+
if (value is ChartDataModel model)
45+
{
46+
if (para == "GrossLastYearDelta")
47+
{
48+
return model.GrossLastYearDelta;
49+
}
50+
doubleValue = (double)model.GrossLastYearDelta;
51+
}
4552

4653
string text = "\ue704";
4754
Color color = Colors.Red;

‎maui/samples/Gallery/Samples/CartesianChart/EmptyPoints/EmptyPointSupport.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@
102102
<Grid>
103103
<VerticalStackLayout Spacing="15">
104104
<HorizontalStackLayout Spacing="5">
105-
<Label Text="Empty Point Mode: " VerticalOptions="Start" HorizontalOptions="Center" Padding="5" FontSize="17"/>
105+
<Label Text="Empty Point Mode : " VerticalOptions="Start" HorizontalOptions="Center" Padding="5" FontSize="17"/>
106106
<Picker WidthRequest="{OnPlatform MacCatalyst=70, iOS=70}" ItemsSource="{Binding Source={x:Reference ViewModel},Path=EmptyPointModeValues}"
107107
SelectedItem="{Binding Source={x:Reference ViewModel}, Path=EmptyPointModeValues[0]}"
108-
VerticalOptions="Start" HorizontalOptions="Fill"
109-
x:Name="picker"
110-
BackgroundColor="{AppThemeBinding Light={StaticResource BackgroundLight}, Dark={StaticResource BackgroundDark}}"
111-
TextColor="{AppThemeBinding Light={StaticResource TextColourLight}, Dark={StaticResource TextColourDark}}"
108+
VerticalOptions="Start" HorizontalOptions="Fill"
109+
x:Name="picker"
112110
SelectedIndex="0"
113-
SelectedIndexChanged="picker_SelectedIndexChanged">
111+
SelectedIndexChanged="picker_SelectedIndexChanged"
112+
Background="{OnPlatform Default={AppThemeBinding Dark={StaticResource TextColour1Dark}, Light={StaticResource BackgroundLight}},Android=Transparent}"
113+
TextColor="{OnPlatform Default={StaticResource TextColourLight}, Android={AppThemeBinding Light={StaticResource TextColourLight}, Dark={StaticResource TextColourDark}}}">
114114
</Picker>
115115
</HorizontalStackLayout>
116116
</VerticalStackLayout>

‎maui/samples/Gallery/Samples/CartesianChart/ErrorBar/ErrorBarChart.xaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@
8080
<ColumnDefinition Width="*"></ColumnDefinition>
8181
</Grid.ColumnDefinitions>
8282
<Label Grid.Row="0" Grid.Column="0" Text=" Type" HorizontalOptions="Start" Padding="5" FontSize="15"/>
83-
<Picker Grid.Row="0" Grid.Column="1"
83+
<Picker Grid.Row="0" Grid.Column="1" Margin="0,0,1,0"
8484
ItemsSource="{Binding Source={x:Reference ViewModel},Path=ErrorBarType}"
8585
SelectedItem="{Binding Source={x:Reference ViewModel}, Path=ErrorBarType[0]}"
8686
VerticalOptions="Start" HorizontalOptions="Fill"
8787
x:Name="typePicker"
88-
SelectedIndex="0"
89-
BackgroundColor="{AppThemeBinding Light={StaticResource BackgroundLight}, Dark={StaticResource BackgroundDark}}"
90-
TextColor="{AppThemeBinding Light={StaticResource TextColourLight}, Dark={StaticResource TextColourDark}}"
91-
SelectedIndexChanged="typePicker_SelectedIndexChanged">
88+
SelectedIndex="0"
89+
SelectedIndexChanged="typePicker_SelectedIndexChanged"
90+
Background="{OnPlatform Default={AppThemeBinding Dark={StaticResource TextColour1Dark}, Light={StaticResource BackgroundLight}},Android=Transparent}"
91+
TextColor="{OnPlatform Default={StaticResource TextColourLight}, Android={AppThemeBinding Light={StaticResource TextColourLight}, Dark={StaticResource TextColourDark}}}">
9292
</Picker>
9393
</Grid>
9494
<Grid>
@@ -97,15 +97,15 @@
9797
<ColumnDefinition Width="*"></ColumnDefinition>
9898
</Grid.ColumnDefinitions>
9999
<Label Grid.Row="0" Grid.Column="0" Text="Mode" HorizontalOptions="Start" Padding="5" FontSize="15"/>
100-
<Picker Grid.Row="0" Grid.Column="1"
100+
<Picker Grid.Row="0" Grid.Column="1" Margin="0,0,1,0"
101101
ItemsSource="{Binding Source={x:Reference ViewModel},Path=ErrorBarMode}"
102102
SelectedItem="{Binding Source={x:Reference ViewModel}, Path=ErrorBarMode[0]}"
103103
VerticalOptions="Start" HorizontalOptions="Fill"
104104
x:Name="modePicker"
105-
BackgroundColor="{AppThemeBinding Light={StaticResource BackgroundLight}, Dark={StaticResource BackgroundDark}}"
106-
TextColor="{AppThemeBinding Light={StaticResource TextColourLight}, Dark={StaticResource TextColourDark}}"
107105
SelectedIndex="0"
108-
SelectedIndexChanged="modePicker_SelectedIndexChanged">
106+
SelectedIndexChanged="modePicker_SelectedIndexChanged"
107+
Background="{OnPlatform Default={AppThemeBinding Dark={StaticResource TextColour1Dark}, Light={StaticResource BackgroundLight}},Android=Transparent}"
108+
TextColor="{OnPlatform Default={StaticResource TextColourLight}, Android={AppThemeBinding Light={StaticResource TextColourLight}, Dark={StaticResource TextColourDark}}}">
109109
</Picker>
110110
</Grid>
111111
<Grid>
@@ -114,15 +114,15 @@
114114
<ColumnDefinition Width="*"></ColumnDefinition>
115115
</Grid.ColumnDefinitions>
116116
<Label Grid.Row="0" Grid.Column="0" Text="Direction" HorizontalOptions="Start" Padding="5" FontSize="15"/>
117-
<Picker Grid.Row="0" Grid.Column="1"
117+
<Picker Grid.Row="0" Grid.Column="1" Margin="0,0,1,0"
118118
ItemsSource="{Binding Source={x:Reference ViewModel},Path=ErrorBarDirection}"
119119
SelectedItem="{Binding Source={x:Reference ViewModel}, Path=ErrorBarDirection[0]}"
120120
VerticalOptions="Start" HorizontalOptions="Fill"
121121
x:Name="directionPicker"
122-
BackgroundColor="{AppThemeBinding Light={StaticResource BackgroundLight}, Dark={StaticResource BackgroundDark}}"
123-
TextColor="{AppThemeBinding Light={StaticResource TextColourLight}, Dark={StaticResource TextColourDark}}"
124122
SelectedIndex="0"
125-
SelectedIndexChanged="directionPicker_SelectedIndexChanged">
123+
SelectedIndexChanged="directionPicker_SelectedIndexChanged"
124+
Background="{OnPlatform Default={AppThemeBinding Dark={StaticResource TextColour1Dark}, Light={StaticResource BackgroundLight}},Android=Transparent}"
125+
TextColor="{OnPlatform Default={StaticResource TextColourLight}, Android={AppThemeBinding Light={StaticResource TextColourLight}, Dark={StaticResource TextColourDark}}}">
126126
</Picker>
127127
</Grid>
128128
<Grid>

‎maui/samples/Gallery/Samples/CartesianChart/PlotBand/HorizontalPlotBand.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,10 @@
7272
<VerticalStackLayout Spacing="5">
7373
<HorizontalStackLayout>
7474
<Label Text="Plot band types :" HorizontalOptions="Center" VerticalOptions="Start" Padding="5" FontSize="17"/>
75-
<Picker ItemsSource="{Binding Source={x:Reference ViewModel},Path=PlotBandType}" SelectedItem="{Binding Source={x:Reference ViewModel},Path=PlotBandType[0]}" BackgroundColor="{AppThemeBinding Light={StaticResource BackgroundLight}, Dark={StaticResource BackgroundDark}}"
76-
TextColor="{AppThemeBinding Light={StaticResource TextColourLight}, Dark={StaticResource TextColourDark}}" HorizontalOptions="Fill" VerticalOptions="Start" SelectedIndex="0" SelectedIndexChanged="Picker_SelectedIndexChanged" WidthRequest="{OnPlatform iOS=80}"/>
75+
<Picker ItemsSource="{Binding Source={x:Reference ViewModel},Path=PlotBandType}" SelectedItem="{Binding Source={x:Reference ViewModel},Path=PlotBandType[0]}"
76+
HorizontalOptions="Fill" VerticalOptions="Start" SelectedIndex="0" SelectedIndexChanged="Picker_SelectedIndexChanged" WidthRequest="{OnPlatform iOS=80}"
77+
Background="{OnPlatform Default={AppThemeBinding Dark={StaticResource TextColour1Dark}, Light={StaticResource BackgroundLight}},Android=Transparent}"
78+
TextColor="{OnPlatform Default={StaticResource TextColourLight}, Android={AppThemeBinding Light={StaticResource TextColourLight}, Dark={StaticResource TextColourDark}}}"/>
7779
</HorizontalStackLayout>
7880
</VerticalStackLayout>
7981
</Grid>

‎maui/samples/Gallery/Samples/CartesianChart/PlotBand/HorizontalPlotBandWindows.xaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@
7171
<VerticalStackLayout Spacing="5">
7272
<HorizontalStackLayout>
7373
<Label Text="Plot band types :" HorizontalOptions="Center" VerticalOptions="Start" Padding="5" FontSize="17"/>
74-
<Picker ItemsSource="{Binding Source={x:Reference ViewModel},Path=PlotBandType}" SelectedItem="{Binding Source={x:Reference ViewModel},Path=PlotBandType[0]}" WidthRequest="{OnPlatform MacCatalyst=80}" BackgroundColor="{AppThemeBinding Light={StaticResource BackgroundLight}, Dark={StaticResource BackgroundDark}}"
75-
TextColor="{AppThemeBinding Light={StaticResource TextColourLight}, Dark={StaticResource TextColourDark}}" HorizontalOptions="Fill" VerticalOptions="Start" SelectedIndex="0" SelectedIndexChanged="Picker_SelectedIndexChanged"/>
74+
<Picker ItemsSource="{Binding Source={x:Reference ViewModel},Path=PlotBandType}" SelectedItem="{Binding Source={x:Reference ViewModel},Path=PlotBandType[0]}" WidthRequest="{OnPlatform MacCatalyst=80}"
75+
HorizontalOptions="Fill" VerticalOptions="Start" SelectedIndex="0" SelectedIndexChanged="Picker_SelectedIndexChanged" Background="{OnPlatform Default={AppThemeBinding Dark={StaticResource TextColour1Dark}, Light={StaticResource BackgroundLight}},Android=Transparent}"
76+
TextColor="{OnPlatform Default={StaticResource TextColourLight}, Android={AppThemeBinding Light={StaticResource TextColourLight}, Dark={StaticResource TextColourDark}}}"/>
7677
</HorizontalStackLayout>
7778
</VerticalStackLayout>
7879
</Grid>

‎maui/samples/Gallery/Samples/CartesianChart/Selection/Selection.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</chart:SfCartesianChart>
7676
<AbsoluteLayout VerticalOptions="Start" Margin="0,40,0,0" HeightRequest="40">
7777
<HorizontalStackLayout AbsoluteLayout.LayoutFlags="PositionProportional" AbsoluteLayout.LayoutBounds="1,0">
78-
<Label Text="Multiple Selection :" VerticalOptions="Center" FontSize="16" TextColor="{AppThemeBinding Default={StaticResource ContentForeground}}"/>
78+
<Label Text="Multiple Selection : " VerticalOptions="Center" FontSize="16" TextColor="{AppThemeBinding Default={StaticResource ContentForeground}}"/>
7979
<CheckBox x:Name="checkbox" HeightRequest="35" VerticalOptions="Center" CheckedChanged="checkbox_CheckedChanged"/>
8080
</HorizontalStackLayout>
8181
</AbsoluteLayout>

‎maui/samples/Gallery/Samples/CartesianChart/Selection/SeriesSelection.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777

7878
<AbsoluteLayout VerticalOptions="Start" Margin="0,40,0,0" HeightRequest="40">
7979
<HorizontalStackLayout AbsoluteLayout.LayoutFlags="PositionProportional" AbsoluteLayout.LayoutBounds="1,0">
80-
<Label Text="Multiple Selection :" VerticalOptions="Center" FontSize="16" TextColor="{AppThemeBinding Default={StaticResource ContentForeground}}"/>
80+
<Label Text="Multiple Selection : " VerticalOptions="Center" FontSize="16" TextColor="{AppThemeBinding Default={StaticResource ContentForeground}}"/>
8181
<CheckBox x:Name="checkbox" HeightRequest="35" VerticalOptions="Center" CheckedChanged="checkbox_CheckedChanged"/>
8282
</HorizontalStackLayout>
8383
</AbsoluteLayout>

0 commit comments

Comments
 (0)