|
2 | 2 | xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
3 | 3 | xmlns:dxco="clr-namespace:DevExpress.Maui.Controls;assembly=DevExpress.Maui.Controls"
|
4 | 4 | xmlns:dxcv="clr-namespace:DevExpress.Maui.CollectionView;assembly=DevExpress.Maui.CollectionView"
|
| 5 | + xmlns:dx="clr-namespace:DevExpress.Maui.Core;assembly=DevExpress.Maui.Core" |
5 | 6 | xmlns:dxe="clr-namespace:DevExpress.Maui.Editors;assembly=DevExpress.Maui.Editors"
|
6 | 7 | xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
|
7 | 8 | xmlns:local="clr-namespace:CollectionViewFilteringUI"
|
|
13 | 14 | Background="{StaticResource ThemeBackgroundBrush}"
|
14 | 15 | x:Class= "CollectionViewFilteringUI.MainPage">
|
15 | 16 | <ContentPage.Behaviors>
|
16 |
| - <toolkit:StatusBarBehavior StatusBarColor="{AppThemeBinding Light={StaticResource BackgroundThemeColor}, Dark={StaticResource BackgroundThemeColorDark}}" StatusBarStyle="{AppThemeBinding Light=DarkContent, Dark=LightContent}" /> |
| 17 | + <dx:SystemBarBehavior AndroidStatusBarBackground="{AppThemeBinding Light={StaticResource BackgroundThemeColor}, Dark={StaticResource BackgroundThemeColorDark}}" AndroidNavigationBarBackground="{AppThemeBinding Light={StaticResource BackgroundThemeColor}, Dark={StaticResource BackgroundThemeColorDark}}"/> |
17 | 18 | </ContentPage.Behaviors>
|
18 | 19 | <ContentPage.Resources>
|
19 | 20 | <utils:EnumToDescriptionConverter x:Key="enumToDesriptionConverter"/>
|
20 | 21 | <DataTemplate x:Key="houseCardTemplate">
|
21 |
| - <Border Margin="{OnIdiom Phone='18,9,18,9', Tablet='40,20,40,20'}" |
22 |
| - StrokeShape="RoundRectangle 10,10,10,10" |
23 |
| - BackgroundColor="{AppThemeBinding Light={StaticResource HouseCardBackgroundColor}, Dark={StaticResource HouseCardBackgroundColorDark}}"> |
24 |
| - <Border.Shadow> |
| 22 | + <dx:DXBorder Margin="{OnIdiom Phone='18,9,18,9', Tablet='40,20,40,20'}" |
| 23 | + CornerRadius="10" |
| 24 | + BorderThickness="1" |
| 25 | + BackgroundColor="{AppThemeBinding Light={StaticResource HouseCardBackgroundColor}, Dark={StaticResource HouseCardBackgroundColorDark}}"> |
| 26 | + <dx:DXBorder.Shadow> |
25 | 27 | <OnPlatform x:TypeArguments="Shadow">
|
26 | 28 | <On Platform="iOS">
|
27 | 29 | <On.Value>
|
|
40 | 42 | </On.Value>
|
41 | 43 | </On>
|
42 | 44 | </OnPlatform>
|
43 |
| - </Border.Shadow> |
44 |
| - <utils:DockLayout RowSpacing="0"> |
45 |
| - <Grid utils:DockLayout.Dock="Top" |
| 45 | + </dx:DXBorder.Shadow> |
| 46 | + <dx:DXDockLayout VerticalSpacing="0"> |
| 47 | + <Grid dx:DXDockLayout.Dock="Top" |
46 | 48 | RowSpacing="0"
|
47 | 49 | ColumnSpacing="0"
|
48 | 50 | Padding="0">
|
|
62 | 64 | <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource ToogleFavoriteIconBackgroundColor}, Dark={StaticResource ToogleFavoriteIconBackgroundColorDark}}"/>
|
63 | 65 | </DataTrigger>
|
64 | 66 | </Border.Triggers>
|
65 |
| - <dxco:DXImage |
| 67 | + <dx:DXImage |
66 | 68 | Margin="12"
|
67 | 69 | Source="filteringui_like"
|
68 | 70 | TintColor="{AppThemeBinding Light={StaticResource FavoriteIconStrokeColor}, Dark={StaticResource FavoriteIconStrokeColorDark}}">
|
69 |
| - <dxco:DXImage.Triggers> |
70 |
| - <DataTrigger Binding="{Binding IsFavorite}" Value="True" TargetType="dxco:DXImage"> |
| 71 | + <dx:DXImage.Triggers> |
| 72 | + <DataTrigger Binding="{Binding IsFavorite}" Value="True" TargetType="dx:DXImage"> |
71 | 73 | <Setter Property="TintColor" Value="{AppThemeBinding Light={StaticResource ToogleFavoriteIconStrokeColor}, Dark={StaticResource ToogleFavoriteIconStrokeColorDark}}"/>
|
72 | 74 | </DataTrigger>
|
73 |
| - </dxco:DXImage.Triggers> |
74 |
| - </dxco:DXImage> |
| 75 | + </dx:DXImage.Triggers> |
| 76 | + </dx:DXImage> |
75 | 77 | <Border.GestureRecognizers>
|
76 | 78 | <TapGestureRecognizer
|
77 | 79 | NumberOfTapsRequired="1"
|
|
80 | 82 | </Border.GestureRecognizers>
|
81 | 83 | </Border>
|
82 | 84 | </Grid>
|
83 |
| - <utils:DockLayout Padding="14,0,14,14" RowSpacing="8" ColumnSpacing="8"> |
84 |
| - <Label utils:DockLayout.Dock="Top" |
| 85 | + <dx:DXDockLayout Padding="14,0,14,14" VerticalSpacing="8" HorizontalSpacing="8"> |
| 86 | + <Label dx:DXDockLayout.Dock="Top" |
85 | 87 | Text="{Binding Type, Converter={StaticResource enumToDesriptionConverter}}"
|
86 | 88 | TextColor="{AppThemeBinding Light={StaticResource HouseTypeTextColor}, Dark={StaticResource HouseTypeTextColorDark}}"
|
87 | 89 | FontAttributes="Bold"
|
88 | 90 | FontSize="{OnIdiom Phone=16, Tablet=18}"/>
|
89 |
| - <dxco:DXImage utils:DockLayout.Dock="Left" |
| 91 | + <dx:DXImage dx:DXDockLayout.Dock="Left" |
90 | 92 | Margin="0,0,0,2"
|
91 | 93 | VerticalOptions="Start"
|
92 | 94 | Source="filteringui_location_small"
|
93 | 95 | TintColor="{AppThemeBinding Light={StaticResource AccentColor}, Dark={StaticResource AccentColorDark}}"/>
|
94 |
| - <Grid utils:DockLayout.Dock="Left" |
| 96 | + <Grid dx:DXDockLayout.Dock="Left" |
95 | 97 | Padding="0"
|
96 | 98 | Margin="0"
|
97 | 99 | ColumnDefinitions="*,Auto">
|
|
112 | 114 | HorizontalTextAlignment="End"
|
113 | 115 | FontSize="{OnIdiom Phone=16, Tablet=18}"/>
|
114 | 116 | </Grid>
|
115 |
| - </utils:DockLayout> |
116 |
| - </utils:DockLayout> |
117 |
| - </Border> |
| 117 | + </dx:DXDockLayout> |
| 118 | + </dx:DXDockLayout> |
| 119 | + </dx:DXBorder> |
118 | 120 | </DataTemplate>
|
119 | 121 | <DataTemplate x:Key="filteringUIFormTemplate">
|
120 | 122 | <utils:ScrollViewFix Background="{StaticResource ThemeBackgroundBrush}">
|
121 |
| - <VerticalStackLayout> |
| 123 | + <dx:DXStackLayout Orientation="Vertical"> |
122 | 124 | <dxe:FilterRadioListPickerItem
|
123 | 125 | FieldName="City"
|
124 | 126 | ShowValuesOutOfFilter="true"
|
|
147 | 149 | <dxe:FilterCheckedChipGroupItem Text="Bedrooms" ShowValuesOutOfFilter="true" FieldName="Beds"/>
|
148 | 150 | <dxe:FilterNumericRangeItem Text="Year Built" FieldName="YearBuilt"/>
|
149 | 151 | <dxe:FilterCheckItem Text="Must have garage" FieldName="IsGarageExist"/>
|
150 |
| - </VerticalStackLayout> |
| 152 | + </dx:DXStackLayout> |
151 | 153 | </utils:ScrollViewFix>
|
152 | 154 | </DataTemplate>
|
153 | 155 | </ContentPage.Resources>
|
|
156 | 158 | </ContentPage.ToolbarItems>
|
157 | 159 | <Grid BackgroundColor="{AppThemeBinding Light={StaticResource BackgroundThemeColor}, Dark={StaticResource BackgroundThemeColorDark}}">
|
158 | 160 | <dxco:TabView HeaderPanelPosition="Bottom" ItemHeaderPadding="0"
|
159 |
| - ItemHeaderWidth="*" HeaderPanelBackgroundColor="Transparent" |
160 |
| - HeaderPanelPadding="0" |
161 |
| - IsSelectedItemIndicatorVisible="False" |
162 |
| - SelectedItemIndex="{Binding SelectedTabIndex}"> |
| 161 | + ItemHeaderWidth="*" HeaderPanelBackgroundColor="Transparent" |
| 162 | + HeaderPanelPadding="0" |
| 163 | + IsSelectedItemIndicatorVisible="False" |
| 164 | + SelectedItemIndex="{Binding SelectedTabIndex}"> |
163 | 165 | <dxco:TabViewItem>
|
164 | 166 | <dxco:TabViewItem.HeaderContent>
|
165 | 167 | <local:TabHeaderControl Caption="Home" IconPath="filteringui_home" IsSelected="{Binding IsHomeTabSelected}"/>
|
|
0 commit comments