Skip to content

Commit e71e2ad

Browse files
authored
Merge pull request #574 from tj-devel709/revert-CVA11yTemplate
Revert Keyboard DeveloperAccessibility PRs
2 parents cc1ce37 + 8eb5eb3 commit e71e2ad

File tree

2 files changed

+22
-29
lines changed

2 files changed

+22
-29
lines changed

9.0/Apps/DeveloperBalance/Pages/MainPage.xaml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,21 @@
3838
<Label Text="Task Categories" Style="{StaticResource Title2}"/>
3939
<controls:CategoryChart />
4040
<Label Text="Projects" Style="{StaticResource Title2}"/>
41-
<CollectionView
42-
ItemsSource="{Binding Projects}"
43-
Margin="-15, 0">
44-
<CollectionView.ItemsLayout>
45-
<LinearItemsLayout
46-
Orientation="Horizontal"
47-
ItemSpacing="15" />
48-
</CollectionView.ItemsLayout>
49-
<CollectionView.ItemTemplate>
50-
<DataTemplate x:DataType="models:Project">
51-
<controls:ProjectCardView WidthRequest="200">
52-
<controls:ProjectCardView.GestureRecognizers>
53-
<TapGestureRecognizer Command="{Binding NavigateToProjectCommand, Source={RelativeSource AncestorType={x:Type pageModels:MainPageModel}}, x:DataType=pageModels:MainPageModel}" CommandParameter="{Binding .}"/>
54-
</controls:ProjectCardView.GestureRecognizers>
55-
</controls:ProjectCardView>
56-
</DataTemplate>
57-
</CollectionView.ItemTemplate>
58-
</CollectionView>
41+
<ScrollView Orientation="Horizontal" Margin="-30,0">
42+
<HorizontalStackLayout
43+
Spacing="15" Padding="30,0"
44+
BindableLayout.ItemsSource="{Binding Projects}">
45+
<BindableLayout.ItemTemplate>
46+
<DataTemplate x:DataType="models:Project">
47+
<controls:ProjectCardView WidthRequest="200">
48+
<controls:ProjectCardView.GestureRecognizers>
49+
<TapGestureRecognizer Command="{Binding NavigateToProjectCommand, Source={RelativeSource AncestorType={x:Type pageModels:MainPageModel}}, x:DataType=pageModels:MainPageModel}" CommandParameter="{Binding .}"/>
50+
</controls:ProjectCardView.GestureRecognizers>
51+
</controls:ProjectCardView>
52+
</DataTemplate>
53+
</BindableLayout.ItemTemplate>
54+
</HorizontalStackLayout>
55+
</ScrollView>
5956
<Grid HeightRequest="44">
6057
<Label Text="Tasks" Style="{StaticResource Title2}" VerticalOptions="Center"/>
6158
<ImageButton

9.0/Apps/DeveloperBalance/Pages/ProjectListPage.xaml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,11 @@
1717
</ContentPage.Behaviors>
1818
<Grid>
1919
<ScrollView>
20-
<CollectionView
21-
ItemsSource="{Binding Projects}"
22-
Margin="{StaticResource LayoutPadding}">
23-
<CollectionView.ItemsLayout>
24-
<LinearItemsLayout
25-
Orientation="Vertical"
26-
ItemSpacing="{StaticResource LayoutSpacing}"/>
27-
</CollectionView.ItemsLayout>
28-
<CollectionView.ItemTemplate>
20+
<VerticalStackLayout
21+
BindableLayout.ItemsSource="{Binding Projects}"
22+
Margin="{StaticResource LayoutPadding}"
23+
Spacing="{StaticResource LayoutSpacing}">
24+
<BindableLayout.ItemTemplate>
2925
<DataTemplate x:DataType="models:Project">
3026
<Border>
3127
<VerticalStackLayout Padding="10">
@@ -37,8 +33,8 @@
3733
</Border.GestureRecognizers>
3834
</Border>
3935
</DataTemplate>
40-
</CollectionView.ItemTemplate>
41-
</CollectionView>
36+
</BindableLayout.ItemTemplate>
37+
</VerticalStackLayout>
4238
</ScrollView>
4339

4440
<controls:AddButton

0 commit comments

Comments
 (0)