Fix pre13 build errors

davidortinau · Feb 17, 2022 · 95da7b6 · 95da7b6
1 parent 562ee35
commit 95da7b6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/src/WeatherTwentyOne/App.xaml b/src/WeatherTwentyOne/App.xaml
@@ -23,18 +23,18 @@
 
             <Shell.FlyoutFooterTemplate>
                 <DataTemplate>
-                    <GridLayout RowDefinitions="68">
-                        <GridLayout.GestureRecognizers>
+                    <Grid RowDefinitions="68">
+                        <Grid.GestureRecognizers>
                             <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped"/>
-                        </GridLayout.GestureRecognizers>
+                        </Grid.GestureRecognizers>
                         <Image Source="tab_settings.png"
                                VerticalOptions="Center"
                                HorizontalOptions="Center"
                                WidthRequest="40"
                                HeightRequest="40"
                         />
 
-                    </GridLayout>
+                    </Grid>
                 </DataTemplate>
 
             </Shell.FlyoutFooterTemplate>

diff --git a/src/WeatherTwentyOne/Pages/FavoritesPage.xaml b/src/WeatherTwentyOne/Pages/FavoritesPage.xaml
@@ -16,7 +16,7 @@
                 HasShadow="False"
                 x:DataType="c:Location"
                 BackgroundColor="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource Background_Mid}}">
-                <GridLayout
+                <Grid
                                 RowDefinitions="42,40,*"
                                 Padding="20">
                     <Image
@@ -31,14 +31,14 @@
 
                     <VerticalStackLayout
                                     Spacing="0"
-                                    GridLayout.RowSpan="3" 
+                                    Grid.RowSpan="3" 
                                     VerticalOptions="Center">
                         <Label Text="{Binding Name}" class="Subhead" />
                         <Label Text="{Binding WeatherStation}" class="SubContent"/>
                     </VerticalStackLayout>
 
                     <HorizontalStackLayout
-                                GridLayout.Row="2"
+                                Grid.Row="2"
                                 Spacing="10"
                                 VerticalOptions="End">
                         <Image Source="solid_umbrella.png" VerticalOptions="Center"
@@ -47,15 +47,15 @@
                     </HorizontalStackLayout>
 
                     <HorizontalStackLayout
-                                    GridLayout.Row="2"
+                                    Grid.Row="2"
                                     Spacing="10"
                                     HorizontalOptions="End"
                                     VerticalOptions="End">
                         <Image Source="solid_humidity.png" VerticalOptions="Center"
                                        WidthRequest="20" HeightRequest="20"/>
                         <Label Text="45%" class="Small" VerticalOptions="Center"/>
                     </HorizontalStackLayout>
-                </GridLayout>
+                </Grid>
             </Frame>
 
 
@@ -77,7 +77,7 @@
                 <Border.StrokeShape>
                     <RoundRectangle CornerRadius="40"/>
                 </Border.StrokeShape>
-                <GridLayout
+                <Grid
                                 RowDefinitions="42,40,*"
                                 Padding="20">
                     <Image
@@ -92,14 +92,14 @@
 
                     <VerticalStackLayout
                                     Spacing="0"
-                                    GridLayout.RowSpan="3" 
+                                    Grid.RowSpan="3" 
                                     VerticalOptions="Center">
                         <Label Text="{Binding Name}" class="Subhead" />
                         <Label Text="{Binding WeatherStation}" class="SubContent"/>
                     </VerticalStackLayout>
 
                     <HorizontalStackLayout
-                                GridLayout.Row="2"
+                                Grid.Row="2"
                                 Spacing="10"
                                 VerticalOptions="End">
                         <Image Source="solid_umbrella.png" VerticalOptions="Center"
@@ -108,15 +108,15 @@
                     </HorizontalStackLayout>
 
                     <HorizontalStackLayout
-                                    GridLayout.Row="2"
+                                    Grid.Row="2"
                                     Spacing="10"
                                     HorizontalOptions="End"
                                     VerticalOptions="End">
                         <Image Source="solid_humidity.png" VerticalOptions="Center"
                                        WidthRequest="20" HeightRequest="20"/>
                         <Label Text="45%" class="Small" VerticalOptions="Center"/>
                     </HorizontalStackLayout>
-                </GridLayout>
+                </Grid>
             </Border>
         </DataTemplate>
     </ContentPage.Resources>

diff --git a/src/WeatherTwentyOne/Pages/HomePage.xaml b/src/WeatherTwentyOne/Pages/HomePage.xaml
@@ -8,13 +8,13 @@
     Title="Redmond, WA"
     x:Class="WeatherTwentyOne.Pages.HomePage">
 
-    <GridLayout
+    <Grid
         ColumnDefinitions="{OnIdiom Phone='*', Default='*,500'}"
         RowDefinitions="*"
         >
 
         <!-- Main content -->
-        <ScrollView GridLayout.Column="0">
+        <ScrollView Grid.Column="0">
             <VerticalStackLayout
                 Padding="{OnIdiom Phone='0,50',Default='0,50'}"
                 Spacing="{OnIdiom Phone=25,Default=50}">
@@ -45,9 +45,9 @@
         </ScrollView>
 
         <!-- Widget panel -->
-        <v:WidgetsPanel GridLayout.Column="{OnIdiom Phone=0, Default=1}"
+        <v:WidgetsPanel Grid.Column="{OnIdiom Phone=0, Default=1}"
                         IsVisible="{OnIdiom Phone=False, Default=True}"/>
 
-    </GridLayout>
+    </Grid>
 
 </ContentPage>
diff --git a/src/WeatherTwentyOne/Pages/SettingsPage.xaml b/src/WeatherTwentyOne/Pages/SettingsPage.xaml
@@ -144,7 +144,7 @@
 
             <Image  HorizontalOptions="Center"
                         VerticalOptions="Center"
-                        GridLayout.Column="1"
+                        Grid.Column="1"
                         WidthRequest="75"
                         HeightRequest="75"
                         Aspect="AspectFill"

diff --git a/src/WeatherTwentyOne/Views/WidgetsPanel.xaml b/src/WeatherTwentyOne/Views/WidgetsPanel.xaml
@@ -1,9 +1,9 @@
-<GridLayout xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
+<Grid xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:m="clr-namespace:WeatherTwentyOne.Models"
              x:Class="WeatherTwentyOne.Views.WidgetsPanel"
             ColumnDefinitions="1,*">
-    <GridLayout.Resources>
+    <Grid.Resources>
         <DataTemplate x:Key="MetricTemplate">
             <Frame
                 HeightRequest="154"
@@ -78,10 +78,10 @@
                 </Grid>
             </Border>
         </DataTemplate>
-    </GridLayout.Resources>
+    </Grid.Resources>
 
      <CollectionView
-         GridLayout.Column="1"
+         Grid.Column="1"
          Margin="5"
          ItemTemplate="{StaticResource MetricTemplate}">
         <CollectionView.ItemsLayout>
@@ -109,4 +109,4 @@
             WidthRequest="1"
             HorizontalOptions="Start"/>
 
-</GridLayout>
+</Grid>