Cherry pick of #519

dotnet · Oct 11, 2024 · 353b25b · 353b25b
1 parent 3ae2170
commit 353b25b
Show file tree

Hide file tree

Showing 46 changed files with 195 additions and 158 deletions.
diff --git a/...serInterface/Views/CollectionViewDemos/CollectionViewDemos/ViewModels/AnimalsViewModel.cs b/...serInterface/Views/CollectionViewDemos/CollectionViewDemos/ViewModels/AnimalsViewModel.cs
@@ -148,7 +148,7 @@ void AddCats()
             Animals.Add(new Animal
             {
                 Name = "Abyssinian",
-                Location = "Ethopia",
+                Location = "Ethiopia",
                 Details = "The Abyssinian is a breed of domestic short-haired cat with a distinctive tickedtabby coat, in which individual hairs are banded with different colors. The breed is named for Abyssinia (now called Ethiopia), where it is believed to have originated.",
                 ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/9/9b/Gustav_chocolate.jpg/168px-Gustav_chocolate.jpg"
             });

diff --git a/...rface/Views/CollectionViewDemos/CollectionViewDemos/ViewModels/GroupedAnimalsViewModel.cs b/...rface/Views/CollectionViewDemos/CollectionViewDemos/ViewModels/GroupedAnimalsViewModel.cs
@@ -97,7 +97,7 @@ void CreateAnimalsCollection()
                 new Animal
                 {
                     Name = "Abyssinian",
-                    Location = "Ethopia",
+                    Location = "Ethiopia",
                     Details = "The Abyssinian is a breed of domestic short-haired cat with a distinctive tickedtabby coat, in which individual hairs are banded with different colors. The breed is named for Abyssinia (now called Ethiopia), where it is believed to have originated.",
                     ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/9/9b/Gustav_chocolate.jpg/168px-Gustav_chocolate.jpg"
                 },

diff --git a/...ctionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml b/...ctionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml
@@ -35,14 +35,16 @@
                                                  OtherTemplate="{StaticResource BasicTemplate}" />
     </ContentPage.Resources>
 
-    <StackLayout Margin="20">
+    <Grid RowDefinitions="Auto, *" 
+          Margin="20">
         <SearchBar x:Name="searchBar"
                    SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={x:Reference searchBar}, Path=Text}"
                    Placeholder="Filter" />
         <CollectionView ItemsSource="{Binding Monkeys}"
                         EmptyView="{Binding Source={x:Reference searchBar}, Path=Text}"
-                        EmptyViewTemplate="{StaticResource SearchSelector}">
+                        EmptyViewTemplate="{StaticResource SearchSelector}"
+                        Grid.Row="1">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Grid Padding="10">
@@ -71,5 +73,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/.../Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewFilteredPage.xaml b/.../Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewFilteredPage.xaml
@@ -3,13 +3,15 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.EmptyViewFilteredPage"
              Title="EmptyView (string)">
-    <StackLayout Margin="20">
+    <Grid RowDefinitions="Auto, *" 
+          Margin="20">
         <SearchBar x:Name="searchBar"
                    SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={x:Reference searchBar}, Path=Text}"
                    Placeholder="Filter" />
         <CollectionView ItemsSource="{Binding Monkeys}"
-                        EmptyView="No items match your filter.">
+                        EmptyView="No items match your filter."
+                        Grid.Row="1">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Grid Padding="10">
@@ -38,5 +40,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/.../CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewLoadSimulationPage.xaml b/.../CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewLoadSimulationPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.EmptyViewLoadSimulationPage"
              Title="EmptyView (load simulation)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView x:Name="collectionView"
                         EmptyView="Loading items simulation.">
             <CollectionView.ItemTemplate>
@@ -34,5 +34,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...face/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewNullPage.xaml b/...face/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewNullPage.xaml
@@ -3,8 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.EmptyViewNullPage"
              Title="EmptyView (Null ItemsSource)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding EmptyMonkeys}"
                         EmptyView="No items to display" />
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...face/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml b/...face/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml
@@ -31,17 +31,19 @@
         </ContentView>
     </ContentPage.Resources>
 
-    <StackLayout Margin="20">
+    <Grid RowDefinitions="Auto, Auto, *" 
+          Margin="20">
         <SearchBar x:Name="searchBar"
                    SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={x:Reference searchBar}, Path=Text}"
                    Placeholder="Filter" />
-        <StackLayout Orientation="Horizontal">
+        <HorizontalStackLayout Grid.Row="1">
             <Label Text="Toggle EmptyViews" />
             <Switch Toggled="OnEmptyViewSwitchToggled" />
-        </StackLayout>
+        </HorizontalStackLayout>
         <CollectionView x:Name="collectionView"
-                        ItemsSource="{Binding Monkeys}">
+                        ItemsSource="{Binding Monkeys}"
+                        Grid.Row="2">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Grid Padding="10">
@@ -70,5 +72,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/.../Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewTemplatePage.xaml b/.../Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewTemplatePage.xaml
@@ -4,12 +4,14 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.EmptyViewTemplatePage"
              Title="EmptyView (template)">
-    <StackLayout Margin="20">
+    <Grid RowDefinitions="Auto, *" 
+          Margin="20">
         <SearchBar x:Name="searchBar"
                    SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={x:Reference searchBar}, Path=Text}"
                    Placeholder="Filter" />
-        <CollectionView ItemsSource="{Binding Monkeys}">
+        <CollectionView ItemsSource="{Binding Monkeys}"
+                        Grid.Row="1">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Grid Padding="10">
@@ -51,5 +53,5 @@
                 </DataTemplate>
             </CollectionView.EmptyViewTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...llectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml b/...llectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml
@@ -3,12 +3,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.EmptyViewWithViewsFilteredPage"
              Title="EmptyView (multiple views)">
-    <StackLayout Margin="20">
+    <Grid RowDefinitions="Auto, *" 
+          Margin="20">
         <SearchBar x:Name="searchBar"
                    SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={x:Reference searchBar}, Path=Text}"
                    Placeholder="Filter" />
-        <CollectionView ItemsSource="{Binding Monkeys}">
+        <CollectionView ItemsSource="{Binding Monkeys}"
+                        Grid.Row="1">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Grid Padding="10">
@@ -55,5 +57,5 @@
                 </ContentView>
             </CollectionView.EmptyView>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...s/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListEmptyGroupsPage.xaml b/...s/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListEmptyGroupsPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.VerticalListEmptyGroupsPage"
              Title="Grouping including empty groups">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Animals}"
                         IsGrouped="true">
             <CollectionView.ItemTemplate>
@@ -48,5 +48,5 @@
                 </DataTemplate>
             </CollectionView.GroupFooterTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...iews/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingPage.xaml b/...iews/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.VerticalListGroupingPage"
              Title="Grouping (with DataTemplates)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Animals}"
                         IsGrouped="true">
             <CollectionView.ItemTemplate>
@@ -48,5 +48,5 @@
                 </DataTemplate>
             </CollectionView.GroupFooterTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...ewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingVariableSizeItemsPage.xaml b/...ewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingVariableSizeItemsPage.xaml
@@ -4,18 +4,19 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.VerticalListGroupingVariableSizeItemsPage"
              Title="Grouping with variable sized items">
-    <StackLayout Margin="20">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+    <Grid RowDefinitions="Auto, *" 
+          Margin="20">
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="ItemSizingStrategy:"
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="enumPicker"
                                  EnumType="{x:Type ItemSizingStrategy}"
                                  SelectedIndex="0" />
-        </StackLayout>
+        </HorizontalStackLayout>
         <CollectionView ItemsSource="{Binding Animals}"
                         IsGrouped="true"
-                        ItemSizingStrategy="{Binding Source={x:Reference enumPicker}, Path=SelectedItem}">
+                        ItemSizingStrategy="{Binding Source={x:Reference enumPicker}, Path=SelectedItem}"
+                        Grid.Row="1">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Grid Padding="10">
@@ -56,7 +57,7 @@
                 </DataTemplate>
             </CollectionView.GroupFooterTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
 
 

diff --git a/.../CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListTextGroupingPage.xaml b/.../CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListTextGroupingPage.xaml
@@ -3,8 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.VerticalListTextGroupingPage"
              Title="Grouping (without DataTemplates)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Animals}"
                         IsGrouped="true" />
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...Demos/CollectionViewDemos/Views/HeadersAndFooters/HorizontalGridHeaderFooterViewPage.xaml b/...Demos/CollectionViewDemos/Views/HeadersAndFooters/HorizontalGridHeaderFooterViewPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.HorizontalGridHeaderFooterViewPage"
              Title="Grid header and footer (View)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}"
                         ItemsLayout="HorizontalGrid, 2">
             <CollectionView.Header>
@@ -50,5 +50,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterDataTemplatePage.xaml b/...CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterDataTemplatePage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.VerticalListHeaderFooterDataTemplatePage"
              Title="Header and footer (DataTemplate)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}"
                         Header="{Binding .}"
                         Footer="{Binding .}">
@@ -55,5 +55,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...Demos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterStringPage.xaml b/...Demos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterStringPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.VerticalListHeaderFooterStringPage"
              Title="Header and footer (string)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}"
                         Header="Monkeys"
                         Footer="2019">
@@ -35,5 +35,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...ewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterViewPage.xaml b/...ewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterViewPage.xaml
@@ -3,7 +3,7 @@
               xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
               x:Class="CollectionViewDemos.Views.VerticalListHeaderFooterViewPage"
               Title="Header and footer (View)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}">
             <CollectionView.Header>
                 <StackLayout BackgroundColor="LightGray">
@@ -49,5 +49,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...erface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalGridPage.xaml b/...erface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalGridPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.HorizontalGridPage"
              Title="Horizontal grid (DataTemplate)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}"
                         ItemsLayout="HorizontalGrid, 4">
             <CollectionView.ItemTemplate>
@@ -36,5 +36,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...ce/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalGridTextPage.xaml b/...ce/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalGridTextPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.HorizontalGridTextPage"
              Title="Horizontal grid (text)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsLayout="HorizontalGrid, 4">
             <CollectionView.ItemsSource>
                 <x:Array Type="{x:Type x:String}">
@@ -27,5 +27,5 @@
                 </x:Array>
             </CollectionView.ItemsSource>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...erface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalListPage.xaml b/...erface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalListPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.HorizontalListPage"
              Title="Horizontal list (DataTemplate)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}"
                         ItemsLayout="HorizontalList">
             <CollectionView.ItemTemplate>
@@ -36,5 +36,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...ce/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalListTextPage.xaml b/...ce/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalListTextPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.HorizontalListTextPage"
              Title="Horizontal list (text)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsLayout="HorizontalList">
             <CollectionView.ItemsSource>
                 <x:Array Type="{x:Type x:String}">
@@ -27,5 +27,5 @@
                 </x:Array>
             </CollectionView.ItemsSource>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/...nterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalGridPage.xaml b/...nterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalGridPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.VerticalGridPage"
              Title="Vertical grid (DataTemplate)">
-  <StackLayout Margin="20">
+  <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}"
                         ItemsLayout="VerticalGrid, 2">
             <CollectionView.ItemTemplate>
@@ -36,5 +36,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>