Skip to content
This repository was archived by the owner on May 15, 2025. It is now read-only.

Commit 0c6b966

Browse files
Merge branch 'develop'
2 parents 203a4b7 + 8f00c60 commit 0c6b966

7 files changed

Lines changed: 13 additions & 4 deletions

File tree

MaterialDesignControls.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata minClientVersion="2.8.1">
44
<id>Plugin.MaterialDesignControls</id>
5-
<version>1.5.1</version>
5+
<version>1.5.2</version>
66
<title>MaterialDesignControls Plugin for Xamarin Forms</title>
77
<authors>Horus</authors>
88
<owners>AgustinBonillaHorus</owners>

example/ExampleMaterialDesignControls/Pages/MaterialDatePickerPage.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
<material:MaterialLabel Text="HorizontalTextAlignment" Margin="0,16,0,0" />
1414
<material:MaterialDatePicker Type="Filled" HorizontalTextAlignment="Start" BackgroundColor="LightGray" TrailingIcon="" />
1515
<material:MaterialDatePicker Type="Filled" HorizontalTextAlignment="Center" BackgroundColor="LightGray" TrailingIcon=""
16-
Placeholder="Select date" PlaceholderColor="Red" />
16+
Placeholder="Select date" PlaceholderColor="Red"
17+
AssistiveText="Required field" LabelText="Date" />
1718
<material:MaterialDatePicker Type="Filled" HorizontalTextAlignment="End" BackgroundColor="LightGray" TrailingIcon="">
1819
<material:MaterialDatePicker.FontFamily>
1920
<OnPlatform x:TypeArguments="x:String">

example/ExampleMaterialDesignControls/Pages/MaterialPickerPage.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
<material:MaterialLabel Text="HorizontalTextAlignment" Margin="0,16,0,0" />
1717
<material:MaterialPicker x:Name="pckModels2" Type="Filled" HorizontalTextAlignment="Start" BackgroundColor="LightGray" TrailingIcon="" />
1818
<material:MaterialPicker x:Name="pckModels3" Type="Filled" HorizontalTextAlignment="Center" BackgroundColor="LightGray" TrailingIcon=""
19-
Placeholder="Select option" PlaceholderColor="Red" />
19+
Placeholder="Select option" PlaceholderColor="Red"
20+
AssistiveText="Required field" LabelText="Option" />
2021
<material:MaterialPicker x:Name="pckModels4" Type="Filled" HorizontalTextAlignment="End" BackgroundColor="LightGray" TrailingIcon="">
2122
<material:MaterialPicker.FontFamily>
2223
<OnPlatform x:TypeArguments="x:String">

example/ExampleMaterialDesignControls/Pages/MaterialTimePickerPage.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
<material:MaterialLabel Text="HorizontalTextAlignment" Margin="0,16,0,0" />
1414
<material:MaterialTimePicker Type="Filled" HorizontalTextAlignment="Start" BackgroundColor="LightGray" TrailingIcon="" />
1515
<material:MaterialTimePicker Type="Filled" HorizontalTextAlignment="Center" BackgroundColor="LightGray" TrailingIcon=""
16-
Placeholder="Select time" PlaceholderColor="Red" />
16+
Placeholder="Select time" PlaceholderColor="Red"
17+
AssistiveText="Required field" LabelText="Time" />
1718
<material:MaterialTimePicker Type="Filled" HorizontalTextAlignment="End" BackgroundColor="LightGray" TrailingIcon="">
1819
<material:MaterialTimePicker.FontFamily>
1920
<OnPlatform x:TypeArguments="x:String">

src/MaterialDesignControls/Controls/MaterialDatePicker.xaml.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,9 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
423423
break;
424424

425425
case nameof(this.HorizontalTextAlignment):
426+
this.lblLabel.HorizontalTextAlignment = this.HorizontalTextAlignment;
426427
this.pckDate.HorizontalTextAlignment = this.HorizontalTextAlignment;
428+
this.lblAssistive.HorizontalTextAlignment = this.HorizontalTextAlignment;
427429
break;
428430

429431
case nameof(this.Placeholder):

src/MaterialDesignControls/Controls/MaterialPicker.xaml.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,9 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
457457
break;
458458

459459
case nameof(this.HorizontalTextAlignment):
460+
this.lblLabel.HorizontalTextAlignment = this.HorizontalTextAlignment;
460461
this.pckOptions.HorizontalTextAlignment = this.HorizontalTextAlignment;
462+
this.lblAssistive.HorizontalTextAlignment = this.HorizontalTextAlignment;
461463
break;
462464

463465
case nameof(this.Placeholder):

src/MaterialDesignControls/Controls/MaterialTimePicker.xaml.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,9 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
399399
break;
400400

401401
case nameof(this.HorizontalTextAlignment):
402+
this.lblLabel.HorizontalTextAlignment = this.HorizontalTextAlignment;
402403
this.pckTime.HorizontalTextAlignment = this.HorizontalTextAlignment;
404+
this.lblAssistive.HorizontalTextAlignment = this.HorizontalTextAlignment;
403405
break;
404406

405407
case nameof(this.Placeholder):

0 commit comments

Comments
 (0)