Fix an issue that ScrollView truncates items when using StackLayout.

xamarin/Xamarin.Forms#13597
cocoa-mhlw · Dec 7, 2021 · 718bf78 · 718bf78
1 parent 758c7f5
commit 718bf78
Show file tree

Hide file tree

Showing 18 changed files with 108 additions and 10 deletions.
diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage1.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage1.xaml
@@ -17,6 +17,11 @@
     NavigationPage.HasNavigationBar="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <Grid Style="{StaticResource HelpPageGridLayout}">
             <Grid.RowDefinitions>
@@ -67,4 +72,5 @@
             </StackLayout>
         </Grid>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage2.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage2.xaml
@@ -16,6 +16,11 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <Grid Style="{StaticResource HelpPageGridLayout}">
             <Grid.RowDefinitions>
@@ -81,4 +86,5 @@
             </StackLayout>
         </Grid>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage3.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage3.xaml
@@ -16,6 +16,11 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <Grid Style="{StaticResource HelpPageGridLayout}" Margin="20">
             <Grid.RowDefinitions>
@@ -148,4 +153,5 @@
             </Grid>
         </Grid>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage4.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage4.xaml
@@ -15,6 +15,11 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <Grid Style="{StaticResource HelpPageGridLayout}">
             <Grid.RowDefinitions>
@@ -38,4 +43,5 @@
             </Grid>
         </Grid>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/InqueryPage.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/InqueryPage.xaml
@@ -15,6 +15,11 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <StackLayout
             Padding="10"
@@ -69,4 +74,5 @@
             <BoxView Style="{StaticResource DefaultLineStyle}" />
         </StackLayout>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/SendLogConfirmationPage.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/SendLogConfirmationPage.xaml
@@ -13,7 +13,7 @@
     Style="{StaticResource DefaultPageStyle}"
     Title="{x:Static resources:AppResources.SendLogConfirmationPageTitle}"
     Visual="Material">
-    <ContentPage.Content>
+    <ContentView>
         <ScrollView
             Margin="0"
             Padding="0">
@@ -69,5 +69,5 @@
                 Text="{x:Static resources:AppResources.SendLogConfirmationPageButton1}" />
             </StackLayout>
         </ScrollView>
-    </ContentPage.Content>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
@@ -16,6 +16,11 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <StackLayout
             Padding="10"
@@ -74,4 +79,5 @@
                 Text="{x:Static resources:AppResources.ContactedNotifyPageButton1}" />
         </StackLayout>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml
@@ -25,6 +25,11 @@
             Text="{x:Static resources:AppResources.MainTutorial}" />
     </ContentPage.ToolbarItems>
 
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <StackLayout
             Padding="15"
@@ -224,4 +229,5 @@
             </StackLayout>
         </StackLayout>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/HowToReceiveProcessingNumberPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/HowToReceiveProcessingNumberPage.xaml
@@ -16,6 +16,11 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <StackLayout
             Spacing="16"
@@ -90,4 +95,5 @@
             </Label>
         </StackLayout>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/NotContactPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/NotContactPage.xaml
@@ -16,6 +16,11 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <Grid Style="{StaticResource DefaultGridLayout}">
             <Grid.RowDefinitions>
@@ -61,4 +66,5 @@
             </Grid>
         </Grid>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml
@@ -17,6 +17,11 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <StackLayout
             Padding="15,15,15,20">
@@ -51,13 +56,12 @@
                 <Label AutomationProperties.IsInAccessibleTree="{Binding IsVisibleWithSymptomsLayout}"
                         Style="{StaticResource DefaultLabel}"
                         Text="{x:Static resources:AppResources.NotifyOtherPageWithSymptomsDescription1}" />
-                <StackLayout Spacing="0"
-                                Margin="0, 5, 0, 10">
                     <Frame Padding="0"
                             BackgroundColor="#CECECE"
                             CornerRadius="7"
                             HasShadow="False"
-                            HorizontalOptions="FillAndExpand">
+                            HorizontalOptions="FillAndExpand"
+                            Margin="0, 5, 0, 10">
                         <Frame Margin="3"
                                 Padding="0"
                                 BackgroundColor="White"
@@ -71,19 +75,17 @@
                         </Frame>
                     </Frame>
                 </StackLayout>
-            </StackLayout>
             <StackLayout Margin="0, 15, 0, 0"
                             IsVisible="{Binding IsVisibleNoSymptomsLayout}">
                 <Label AutomationProperties.IsInAccessibleTree="{Binding IsVisibleNoSymptomsLayout}"
                         Style="{StaticResource DefaultLabel}"
                         Text="{x:Static resources:AppResources.NotifyOtherPageNoSymptomsDescription1}" />
-                <StackLayout Spacing="0"
-                                Margin="0, 5, 0, 10">
                     <Frame Padding="0"
                             BackgroundColor="#CECECE"
                             CornerRadius="7"
                             HasShadow="False"
-                            HorizontalOptions="FillAndExpand">
+                            HorizontalOptions="FillAndExpand"
+                            Margin="0, 5, 0, 10">
                         <Frame Margin="3"
                                 Padding="0"
                                 BackgroundColor="White"
@@ -96,7 +98,6 @@
                                                         Date="{Binding DiagnosisDate}"/>
                         </Frame>
                     </Frame>
-                </StackLayout>
             </StackLayout>
             <Label
                 AutomationProperties.IsInAccessibleTree="True"
@@ -241,4 +242,5 @@
             </Frame>
         </StackLayout>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/SubmitConsentPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/SubmitConsentPage.xaml
@@ -24,6 +24,11 @@
         </DataTrigger>
     </ContentPage.Triggers>
 
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <Grid Style="{StaticResource DefaultGridLayout}">
             <Grid.RowDefinitions>
@@ -130,4 +135,5 @@
             </Grid>
         </Grid>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ThankYouNotifyOtherPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/ThankYouNotifyOtherPage.xaml
@@ -16,6 +16,11 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <Grid Style="{StaticResource DefaultGridLayout}">
             <Grid.RowDefinitions>
@@ -51,4 +56,5 @@
             </Grid>
         </Grid>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/TroubleshootingPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/TroubleshootingPage.xaml
@@ -16,6 +16,11 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <StackLayout
             Padding="20"
@@ -55,5 +60,6 @@
                 AutomationProperties.IsInAccessibleTree="True" />
         </StackLayout>
     </ScrollView>
+    </ContentView>
 </ContentPage>
 
diff --git a/Covid19Radar/Covid19Radar/Views/Settings/DebugPage.xaml b/Covid19Radar/Covid19Radar/Views/Settings/DebugPage.xaml
@@ -15,6 +15,11 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <StackLayout
             Padding="15"
@@ -227,4 +232,5 @@
             </Frame>
         </StackLayout>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/Settings/EditServerConfigurationPage.xaml b/Covid19Radar/Covid19Radar/Views/Settings/EditServerConfigurationPage.xaml
@@ -16,6 +16,11 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <StackLayout
             Padding="0"
@@ -145,4 +150,5 @@
                 VerticalOptions="Start" />
         </StackLayout>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/Settings/SettingsPage.xaml b/Covid19Radar/Covid19Radar/Views/Settings/SettingsPage.xaml
@@ -16,6 +16,11 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <StackLayout
             Padding="0"
@@ -108,4 +113,5 @@
             </Frame>
         </StackLayout>
     </ScrollView>
+    </ContentView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/Tutorial/TutorialPage6.xaml b/Covid19Radar/Covid19Radar/Views/Tutorial/TutorialPage6.xaml
@@ -16,6 +16,11 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
     <ScrollView>
         <Grid Margin="20" Style="{StaticResource DefaultGridLayout}">
             <Grid.RowDefinitions>
@@ -69,4 +74,5 @@
             </StackLayout>
         </Grid>
     </ScrollView>
+    </ContentView>
 </ContentPage>