Skip to content

Commit aa5ad99

Browse files
sergepilipchuksergepilipchuk
authored
Merge pull request #9 from sergepilipchuk/sp-update-control
Update DXStackLayout, DXImage and DXButton controls
2 parents c66a3ee + 587a91d commit aa5ad99

File tree

7 files changed

+73
-70
lines changed

7 files changed

+73
-70
lines changed

‎CS/ASPDataBaseServer/MauiDataGridView_GetFromASPServer/MainPage.xaml

+10-11
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
33
xmlns:dxg="clr-namespace:DevExpress.Maui.DataGrid;assembly=DevExpress.Maui.DataGrid"
44
xmlns:dxe="clr-namespace:DevExpress.Maui.Editors;assembly=DevExpress.Maui.Editors"
5+
xmlns:dx="clr-namespace:DevExpress.Maui.Core;assembly=DevExpress.Maui.Core"
56
xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
67
ios:Page.UseSafeArea="False"
78
x:Class="MauiDataGridView_GetFromASPServer.MainPage">
@@ -29,30 +30,28 @@
2930
<Border.Clip>
3031
<EllipseGeometry RadiusX="30" RadiusY="30" Center="30,30"/>
3132
</Border.Clip>
32-
<Image Source="{Binding Item.Image}" Grid.Column="0" WidthRequest="92" HeightRequest="92" Margin="0,0,5,0" HorizontalOptions="Center" VerticalOptions="Start"/>
33+
<dx:DXImage Source="{Binding Item.Image}" Grid.Column="0" WidthRequest="92" HeightRequest="92" Margin="0,0,5,0" HorizontalOptions="Center" VerticalOptions="Start"/>
3334
</Border>
34-
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Padding="0" Margin="0" Opacity="0.7">
35+
<dx:DXStackLayout Orientation="Vertical" Grid.Row="0" Grid.Column="1" Padding="0" Margin="0" Opacity="0.7">
3536
<Label Text="{Binding Item.Name}" FontSize="16" FontAttributes="Bold"/>
36-
<HorizontalStackLayout Margin="0,4,0,0" >
37+
<dx:DXStackLayout Orientation="Horizontal" Margin="0,4,0,0" >
3738
<Label Text="📞" Padding="0,0,5,0" FontSize="10" VerticalTextAlignment="Center" />
3839
<Label Text="{Binding Item.Phone}" FontSize="14"/>
39-
</HorizontalStackLayout>
40-
<HorizontalStackLayout>
40+
</dx:DXStackLayout>
41+
<dx:DXStackLayout Orientation="Horizontal">
4142
<Label Text="📆" Padding="0,0,5,0" FontSize="10" VerticalTextAlignment="Center" />
4243
<Label Text="{Binding Item.BirthDate, StringFormat='{0:MMMM dd, yyyy}'}" FontSize="14" Margin="0,0,0,0"/>
43-
</HorizontalStackLayout>
44-
<HorizontalStackLayout>
44+
</dx:DXStackLayout>
45+
<dx:DXStackLayout Orientation="Horizontal">
4546
<Label Text="🏢" Padding="0,0,5,0" FontSize="10" VerticalTextAlignment="Center" />
4647
<Label Text="{Binding Item.FavoriteStore}" FontSize="12" Margin="0,0,0,0"/>
47-
</HorizontalStackLayout>
48-
</VerticalStackLayout>
48+
</dx:DXStackLayout>
49+
</dx:DXStackLayout>
4950
</Grid>
5051
</DataTemplate>
5152
</dxg:TemplateColumn.DisplayTemplate>
5253
</dxg:TemplateColumn>
5354
</dxg:DataGridView.Columns>
5455
</dxg:DataGridView>
5556
</Grid>
56-
57-
5857
</ContentPage>

‎CS/ColumnHeaderTemplate/MainPage.xaml

+17-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
22
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
33
xmlns:dxg="clr-namespace:DevExpress.Maui.DataGrid;assembly=DevExpress.Maui.DataGrid"
4+
xmlns:dx="clr-namespace:DevExpress.Maui.Core;assembly=DevExpress.Maui.Core"
45
xmlns:local="clr-namespace:ColumnHeaderTemplate"
56
xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
67
ios:Page.UseSafeArea="true"
@@ -13,53 +14,53 @@
1314
<dxg:ImageColumn FieldName="Photo">
1415
<dxg:ImageColumn.HeaderContentTemplate>
1516
<DataTemplate>
16-
<StackLayout Orientation="Horizontal" HorizontalOptions="Center">
17-
<Image Source="photo.png" VerticalOptions="Center"/>
17+
<dx:DXStackLayout Orientation="Horizontal" HorizontalOptions="Center">
18+
<dx:DXImage Source="photo.png" VerticalOptions="Center"/>
1819
<Label Text="{Binding FieldName}" VerticalOptions="Center"/>
19-
</StackLayout>
20+
</dx:DXStackLayout>
2021
</DataTemplate>
2122
</dxg:ImageColumn.HeaderContentTemplate>
2223
</dxg:ImageColumn>
2324
<dxg:TextColumn FieldName="Name">
2425
<dxg:TextColumn.HeaderContentTemplate>
2526
<DataTemplate>
26-
<StackLayout Orientation="Horizontal">
27-
<Image Source="full_name.png" VerticalOptions="Center"/>
27+
<dx:DXStackLayout Orientation="Horizontal">
28+
<dx:DXImage Source="full_name.png" VerticalOptions="Center"/>
2829
<Label Text="Full Name" VerticalOptions="Center"/>
29-
</StackLayout>
30+
</dx:DXStackLayout>
3031
</DataTemplate>
3132
</dxg:TextColumn.HeaderContentTemplate>
3233
</dxg:TextColumn>
3334
<dxg:TextColumn FieldName="Position">
3435
<dxg:TextColumn.HeaderContentTemplate>
3536
<DataTemplate>
36-
<StackLayout Orientation="Horizontal">
37-
<Image Source="job_title.png" VerticalOptions="Center"/>
37+
<dx:DXStackLayout Orientation="Horizontal">
38+
<dx:DXImage Source="job_title.png" VerticalOptions="Center"/>
3839
<Label Text="Job Title" VerticalOptions="Center"/>
39-
</StackLayout>
40+
</dx:DXStackLayout>
4041
</DataTemplate>
4142
</dxg:TextColumn.HeaderContentTemplate>
4243
</dxg:TextColumn>
4344
<dxg:TextColumn FieldName="Phone">
4445
<dxg:TextColumn.HeaderContentTemplate>
4546
<DataTemplate>
46-
<StackLayout Orientation="Horizontal">
47-
<Image Source="phone.png" VerticalOptions="Center"/>
47+
<dx:DXStackLayout Orientation="Horizontal">
48+
<dx:DXImage Source="phone.png" VerticalOptions="Center"/>
4849
<Label Text="{Binding FieldName}" VerticalOptions="Center"/>
49-
</StackLayout>
50+
</dx:DXStackLayout>
5051
</DataTemplate>
5152
</dxg:TextColumn.HeaderContentTemplate>
5253
</dxg:TextColumn>
5354
<dxg:DateColumn FieldName="HireDate">
5455
<dxg:DateColumn.HeaderContentTemplate>
5556
<DataTemplate>
56-
<StackLayout Orientation="Horizontal">
57-
<Image Source="hire_date.png" VerticalOptions="Center"/>
57+
<dx:DXStackLayout Orientation="Horizontal">
58+
<dx:DXImage Source="hire_date.png" VerticalOptions="Center"/>
5859
<Label Text="Hire Date" VerticalOptions="Center"/>
59-
</StackLayout>
60+
</dx:DXStackLayout>
6061
</DataTemplate>
6162
</dxg:DateColumn.HeaderContentTemplate>
6263
</dxg:DateColumn>
6364
</dxg:DataGridView.Columns>
6465
</dxg:DataGridView>
65-
</ContentPage>
66+
</ContentPage>

‎CS/EditFormTemplate/MainPage.xaml

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
22
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
33
xmlns:dxg="clr-namespace:DevExpress.Maui.DataGrid;assembly=DevExpress.Maui.DataGrid"
4+
xmlns:dx="clr-namespace:DevExpress.Maui.Core;assembly=DevExpress.Maui.Core"
45
xmlns:local="clr-namespace:EditFormTemplate"
56
xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
67
ios:Page.UseSafeArea="true"
@@ -21,23 +22,23 @@
2122
<ColumnDefinition Width="*" />
2223
</Grid.ColumnDefinitions>
2324
<Image Source="{Binding Path=Item.Photo}" Grid.Row="0" Grid.Column="0"/>
24-
<StackLayout Orientation="Vertical" Padding="50, 20, 0, 0"
25+
<dx:DXStackLayout Orientation="Vertical" Padding="50, 20, 0, 0"
2526
Grid.Row="0" Grid.Column="1">
2627
<Label Text="{Binding Path=Item.Name}" VerticalOptions="Start"
2728
FontSize="20" FontAttributes="Bold" />
28-
<StackLayout Orientation="Horizontal">
29+
<dx:DXStackLayout Orientation="Horizontal">
2930
<Label Text="Phone:" FontSize="14" WidthRequest="100"
3031
HorizontalOptions="Start" VerticalOptions="Center" />
3132
<Editor Text="{Binding Path=Item.Phone, Mode=TwoWay}"
3233
FontSize="Small" HorizontalOptions="FillAndExpand"/>
33-
</StackLayout>
34-
<StackLayout Orientation="Horizontal">
34+
</dx:DXStackLayout>
35+
<dx:DXStackLayout Orientation="Horizontal">
3536
<Label Text="Address:" FontSize="14" WidthRequest="100"
3637
HorizontalOptions="Start" VerticalOptions="Center" />
3738
<Editor Text="{Binding Path=Item.Address, Mode=TwoWay}"
3839
FontSize="Small" HorizontalOptions="FillAndExpand"/>
39-
</StackLayout>
40-
</StackLayout>
40+
</dx:DXStackLayout>
41+
</dx:DXStackLayout>
4142
</Grid>
4243
</ScrollView>
4344
</DataTemplate>
@@ -79,4 +80,4 @@
7980
MinWidth="130" VerticalContentAlignment="Center"/>
8081
</dxg:DataGridView.Columns>
8182
</dxg:DataGridView>
82-
</ContentPage>
83+
</ContentPage>

‎CS/ExportGridData/Views/MainPage.xaml

+19-20
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ContentPage.ToolbarItems>
1515
<ToolbarItem IconImageSource="{AppThemeBinding Light=export_button_light, Dark=export_button_light}" Clicked="ExportButton_Clicked"/>
1616
</ContentPage.ToolbarItems>
17-
<StackLayout>
17+
<dx:DXStackLayout>
1818
<dxc:BottomSheet x:Name="bottomSheet" State="{Binding BottomSheetState}" AllowedState="HalfExpanded">
1919
<dxc:BottomSheet.HalfExpandedRatio>
2020
<OnPlatform x:TypeArguments="x:Double">
@@ -58,52 +58,51 @@
5858
<Setter Property="CheckBoxIndent" Value="15"/>
5959
</Style>
6060
</controls:DockLayout.Resources>
61-
<HorizontalStackLayout RadioButtonGroup.GroupName="format" RadioButtonGroup.SelectedValue="{Binding SelectedFormat, Mode=TwoWay}" Spacing="38" controls:DockLayout.Dock="Top">
61+
<dx:DXStackLayout Orientation="Horizontal" RadioButtonGroup.GroupName="format" RadioButtonGroup.SelectedValue="{Binding SelectedFormat, Mode=TwoWay}" ItemSpacing="38" controls:DockLayout.Dock="Top">
6262
<RadioButton Value="{x:Static vm:ExportFormat.Pdf}">
6363
<RadioButton.ControlTemplate>
6464
<ControlTemplate>
65-
<VerticalStackLayout BindingContext="{Binding Source={RelativeSource TemplatedParent}}">
65+
<dx:DXStackLayout Orientation="Vertical" BindingContext="{Binding Source={RelativeSource TemplatedParent}}">
6666
<Border>
67-
<Image Source="pdf"/>
67+
<dx:DXImage Source="pdf"/>
6868
</Border>
6969

7070
<Label Text="PDF" />
71-
</VerticalStackLayout>
71+
</dx:DXStackLayout>
7272
</ControlTemplate>
7373
</RadioButton.ControlTemplate>
7474
</RadioButton>
7575
<RadioButton Value="{x:Static vm:ExportFormat.Xlsx}">
7676
<RadioButton.ControlTemplate>
7777
<ControlTemplate>
78-
<VerticalStackLayout BindingContext="{Binding Source={RelativeSource TemplatedParent}}">
78+
<dx:DXStackLayout Orientation="Vertical" BindingContext="{Binding Source={RelativeSource TemplatedParent}}">
7979
<Border>
80-
<Image Source="xlsx"/>
80+
<dx:DXImage Source="xlsx"/>
8181
</Border>
82-
8382
<Label Text="XLSX"/>
84-
</VerticalStackLayout>
83+
</dx:DXStackLayout>
8584
</ControlTemplate>
8685
</RadioButton.ControlTemplate>
8786
</RadioButton>
8887
<RadioButton Value="{x:Static vm:ExportFormat.Docx}">
8988
<RadioButton.ControlTemplate>
9089
<ControlTemplate>
91-
<VerticalStackLayout BindingContext="{Binding Source={RelativeSource TemplatedParent}}">
90+
<dx:DXStackLayout Orientation="Vertical" BindingContext="{Binding Source={RelativeSource TemplatedParent}}">
9291
<Border>
93-
<Image Source="docx"/>
92+
<dx:DXImage Source="docx"/>
9493
</Border>
9594

9695
<Label Text="DOCX"/>
97-
</VerticalStackLayout>
96+
</dx:DXStackLayout>
9897
</ControlTemplate>
9998
</RadioButton.ControlTemplate>
10099
</RadioButton>
101-
</HorizontalStackLayout>
100+
</dx:DXStackLayout>
102101

103-
<VerticalStackLayout Spacing="25" Margin="5,10,0,0" controls:DockLayout.Dock="Top">
102+
<dx:DXStackLayout Orientation="Vertical" ItemSpacing="25" Margin="5,10,0,0" controls:DockLayout.Dock="Top">
104103
<dxe:CheckEdit Label="Landscape" IsChecked="{Binding LandscapeSelected}"/>
105104
<dxe:CheckEdit Label="Portrait" IsChecked="{Binding PortraitSelected}"/>
106-
</VerticalStackLayout>
105+
</dx:DXStackLayout>
107106

108107
<dxe:ChoiceChipGroup controls:DockLayout.Dock="Top" Padding="0,25" ChipSelectedBackgroundColor="{AppThemeBinding Light={StaticResource SelectedPaperSizeColor_Light}, Dark={StaticResource SelectedPaperSizeColor_Dark}}" ItemsSource="{local:EnumToItemsSource EnumType={x:Type vm:PaperSize}}" SelectedItem="{Binding SelectedPaperSize}"/>
109108

@@ -124,11 +123,11 @@
124123
<dxg:TemplateColumn.DisplayTemplate>
125124
<DataTemplate>
126125
<Grid ColumnDefinitions="Auto,*" Padding="16,8" ColumnSpacing="16" IgnoreSafeArea="True">
127-
<Image Source="{Binding Item.Image}" VerticalOptions="Center" HorizontalOptions="Center" WidthRequest="40" HeightRequest="40">
128-
<Image.Clip>
126+
<dx:DXImage Source="{Binding Item.Image}" VerticalOptions="Center" HorizontalOptions="Center" WidthRequest="40" HeightRequest="40">
127+
<dx:DXImage.Clip>
129128
<EllipseGeometry RadiusX="20" RadiusY="20" Center="20, 20" />
130-
</Image.Clip>
131-
</Image>
129+
</dx:DXImage.Clip>
130+
</dx:DXImage>
132131
<Label Text="{Binding Item.FullName}" TextColor="{Binding Source={RelativeSource AncestorType={x:Type dxg:DataGridView}}, Path=ActualAppearance.GroupRowFontColor}" VerticalOptions="Center" Grid.Column="1" FontFamily="{Binding Source={RelativeSource AncestorType={x:Type dxg:DataGridView}}, Path=ActualAppearance.GroupRowFontFamily}" FontSize="16"/>
133132
</Grid>
134133
</DataTemplate>
@@ -140,5 +139,5 @@
140139
<dxg:DateColumn FieldName="HireDate" MinWidth="120" Width="*" />
141140
</dxg:DataGridView.Columns>
142141
</dxg:DataGridView>
143-
</StackLayout>
142+
</dx:DXStackLayout>
144143
</ContentPage>

‎CS/GridDatafromFireBase/MainPage.xaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
44
x:Class="GridDatafromFireBase.MainPage"
55
xmlns:dxg="clr-namespace:DevExpress.Maui.DataGrid;assembly=DevExpress.Maui.DataGrid"
6+
xmlns:dx="clr-namespace:DevExpress.Maui.Core;assembly=DevExpress.Maui.Core"
67
Title="Employee View">
78

89
<Grid RowDefinitions="*,Auto,Auto">
@@ -37,12 +38,12 @@
3738
<Border.Clip>
3839
<EllipseGeometry RadiusX="25" RadiusY="25" Center="25,25"/>
3940
</Border.Clip>
40-
<Image Source="{Binding Item.Image}" Grid.Column="0" Grid.RowSpan="2" WidthRequest="80" HeightRequest="80" HorizontalOptions="CenterAndExpand" VerticalOptions="CenterAndExpand" Margin="0,30,0,0"/>
41-
</Border>
42-
<HorizontalStackLayout Grid.Row="0" Grid.Column="1">
41+
<dx:DXImage Source="{Binding Item.Image}" Grid.Column="0" Grid.RowSpan="2" WidthRequest="80" HeightRequest="80" HorizontalOptions="CenterAndExpand" VerticalOptions="CenterAndExpand" Margin="0,30,0,0"/>
42+
</Border>
43+
<dx:DXStackLayout Orientation="Horizontal" Grid.Row="0" Grid.Column="1">
4344
<Label Text="{Binding Item.FirstName}" Padding="0,0,4,0"/>
4445
<Label Text="{Binding Item.LastName}" />
45-
</HorizontalStackLayout>
46+
</dx:DXStackLayout>
4647
<Label Text="{Binding Item.Phone}" FontAttributes="None" FontSize="14" Grid.Column="1" Grid.Row="1" Margin="0,0,0,0"/>
4748
</Grid>
4849
</DataTemplate>

0 commit comments

Comments
 (0)