Skip to content

Commit 79c4698

Browse files
David BritchDavid Britch
authored andcommitted
Replaced custom BindablePicker with the updated Xamarin.Forms Picker control.
1 parent efb858f commit 79c4698

3 files changed

Lines changed: 11 additions & 143 deletions

File tree

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Controls/BindablePicker.cs

Lines changed: 0 additions & 130 deletions
This file was deleted.

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/FiltersView.xaml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<slideOverKit:SlideMenuView
33
xmlns="http://xamarin.com/schemas/2014/forms"
44
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
5-
xmlns:slideOverKit="clr-namespace:SlideOverKit"
6-
xmlns:controls="clr-namespace:eShopOnContainers.Core.Controls;assembly=eShopOnContainers.Core"
5+
xmlns:slideOverKit="clr-namespace:SlideOverKit"
76
x:Class="eShopOnContainers.Core.Views.FiltersView"
87
MenuOrientations="TopToBottom"
98
BackgroundColor="{StaticResource BackgroundColor}"
@@ -13,7 +12,7 @@
1312
<ResourceDictionary>
1413

1514
<Style x:Key="FilterPickerStyle"
16-
TargetType="{x:Type controls:BindablePicker}">
15+
TargetType="{x:Type Picker}">
1716
<Setter Property="HeightRequest"
1817
Value="48" />
1918
<Setter Property="BackgroundColor"
@@ -70,35 +69,35 @@
7069
<RowDefinition Height="Auto" />
7170
</Grid.RowDefinitions>
7271
<!-- BRAND -->
73-
<controls:BindablePicker
72+
<Picker
7473
Grid.Row="0"
7574
Title="BRAND"
7675
ItemsSource="{Binding Brands}"
7776
SelectedItem="{Binding Brand, Mode=TwoWay}"
7877
Style="{StaticResource FilterPickerStyle}">
79-
<controls:BindablePicker.HeightRequest>
78+
<Picker.HeightRequest>
8079
<OnPlatform
8180
x:TypeArguments="x:Double"
8281
Android="48"
8382
iOS="48"
8483
WinPhone="36"/>
85-
</controls:BindablePicker.HeightRequest>
86-
</controls:BindablePicker>
84+
</Picker.HeightRequest>
85+
</Picker>
8786
<!-- TYPE -->
88-
<controls:BindablePicker
87+
<Picker
8988
Grid.Row="1"
9089
Title="TYPE"
9190
ItemsSource="{Binding Types}"
9291
SelectedItem="{Binding Type, Mode=TwoWay}"
9392
Style="{StaticResource FilterPickerStyle}">
94-
<controls:BindablePicker.HeightRequest>
93+
<Picker.HeightRequest>
9594
<OnPlatform
9695
x:TypeArguments="x:Double"
9796
Android="48"
9897
iOS="48"
9998
WinPhone="36"/>
100-
</controls:BindablePicker.HeightRequest>
101-
</controls:BindablePicker>
99+
</Picker.HeightRequest>
100+
</Picker>
102101
<Button
103102
Grid.Row="2"
104103
Text="Apply"

src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj

100755100644
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
<Compile Include="Controls\AddBasketButton.xaml.cs">
4848
<DependentUpon>AddBasketButton.xaml</DependentUpon>
4949
</Compile>
50-
<Compile Include="Controls\BindablePicker.cs" />
5150
<Compile Include="Controls\CustomTabbedPage.cs" />
5251
<Compile Include="Controls\ToggleButton.cs" />
5352
<Compile Include="Converters\CountToBoolConverter.cs" />

0 commit comments

Comments
 (0)