Merge pull request #574 from tj-devel709/revert-CVA11yTemplate

Revert Keyboard DeveloperAccessibility PRs
dotnet · Jan 24, 2025 · e71e2ad · e71e2ad
2 parents cc1ce37 + 8eb5eb3
commit e71e2ad
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 29 deletions.
diff --git a/9.0/Apps/DeveloperBalance/Pages/MainPage.xaml b/9.0/Apps/DeveloperBalance/Pages/MainPage.xaml
@@ -38,24 +38,21 @@
                         <Label Text="Task Categories" Style="{StaticResource Title2}"/>
                         <controls:CategoryChart />
                         <Label Text="Projects" Style="{StaticResource Title2}"/>
-                        <CollectionView
-                            ItemsSource="{Binding Projects}"
-                            Margin="-15, 0">
-                            <CollectionView.ItemsLayout>
-                                <LinearItemsLayout                              
-                                    Orientation="Horizontal"
-                                    ItemSpacing="15" />
-                            </CollectionView.ItemsLayout>
-                            <CollectionView.ItemTemplate>
-                                <DataTemplate x:DataType="models:Project">
-                                    <controls:ProjectCardView WidthRequest="200">
-                                        <controls:ProjectCardView.GestureRecognizers>
-                                            <TapGestureRecognizer Command="{Binding NavigateToProjectCommand, Source={RelativeSource AncestorType={x:Type pageModels:MainPageModel}}, x:DataType=pageModels:MainPageModel}" CommandParameter="{Binding .}"/>
-                                        </controls:ProjectCardView.GestureRecognizers>
-                                    </controls:ProjectCardView>
-                                </DataTemplate>
-                            </CollectionView.ItemTemplate>
-                        </CollectionView>
+                        <ScrollView Orientation="Horizontal" Margin="-30,0">
+                            <HorizontalStackLayout 
+                                Spacing="15" Padding="30,0"
+                                BindableLayout.ItemsSource="{Binding Projects}">
+                                <BindableLayout.ItemTemplate>
+                                    <DataTemplate x:DataType="models:Project">
+                                        <controls:ProjectCardView WidthRequest="200">
+                                            <controls:ProjectCardView.GestureRecognizers>
+                                                <TapGestureRecognizer Command="{Binding NavigateToProjectCommand, Source={RelativeSource AncestorType={x:Type pageModels:MainPageModel}}, x:DataType=pageModels:MainPageModel}" CommandParameter="{Binding .}"/>
+                                            </controls:ProjectCardView.GestureRecognizers>
+                                        </controls:ProjectCardView>
+                                    </DataTemplate>
+                                </BindableLayout.ItemTemplate>
+                            </HorizontalStackLayout>
+                        </ScrollView>
                         <Grid HeightRequest="44">
                             <Label Text="Tasks" Style="{StaticResource Title2}" VerticalOptions="Center"/>
                             <ImageButton 

diff --git a/9.0/Apps/DeveloperBalance/Pages/ProjectListPage.xaml b/9.0/Apps/DeveloperBalance/Pages/ProjectListPage.xaml
@@ -17,15 +17,11 @@
     </ContentPage.Behaviors>
     <Grid>
       <ScrollView>
-        <CollectionView 
-            ItemsSource="{Binding Projects}" 
-            Margin="{StaticResource LayoutPadding}">
-            <CollectionView.ItemsLayout>
-                <LinearItemsLayout 
-                    Orientation="Vertical"
-                    ItemSpacing="{StaticResource LayoutSpacing}"/>
-            </CollectionView.ItemsLayout>
-            <CollectionView.ItemTemplate>
+        <VerticalStackLayout 
+            BindableLayout.ItemsSource="{Binding Projects}" 
+            Margin="{StaticResource LayoutPadding}" 
+            Spacing="{StaticResource LayoutSpacing}">
+            <BindableLayout.ItemTemplate>
                 <DataTemplate x:DataType="models:Project">
                     <Border>
                         <VerticalStackLayout Padding="10">
@@ -37,8 +33,8 @@
                         </Border.GestureRecognizers>
                     </Border>
                 </DataTemplate>
-            </CollectionView.ItemTemplate>
-        </CollectionView>
+            </BindableLayout.ItemTemplate>
+        </VerticalStackLayout>
       </ScrollView>
 
         <controls:AddButton