Merge pull request #1614 from microsoft/fix/demo-xamarin-forms-app

Fix Xamarin.Forms demo apps
microsoft · Dec 29, 2021 · 85e0cff · 85e0cff
2 parents 889c456 + 2a5fc23
commit 85e0cff
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 21 deletions.
diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs
@@ -177,7 +177,7 @@ bool ConfirmationHandler()
                 }
                 else
                 {
-                    Current.MainPage.DisplayActionSheet("Crash detected. Send anonymous crash report?", null, null, "Send", "Always Send", "Don't Send");
+                    dialog = Current.MainPage.DisplayActionSheet("Crash detected. Send anonymous crash report?", null, null, "Send", "Always Send", "Don't Send");
                 }
                 dialog.ContinueWith((arg) =>
                 {
@@ -199,7 +199,6 @@ bool ConfirmationHandler()
                     Crashes.NotifyUserConfirmation(userConfirmationSelection);
                 });
             });
-
             return true;
         }
 

diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AnalyticsContentPage.xaml b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AnalyticsContentPage.xaml
@@ -4,9 +4,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="Contoso.Forms.Demo.AnalyticsContentPage">
     <ScrollView>
-        <StackLayout Orientation="Vertical">
+        <StackLayout Padding="16" Orientation="Vertical">
             <StackLayout Orientation="Vertical">
-                <Label Text="Analytics Settings"/>
+                <Label FontSize="Medium" Text="Analytics Settings"/>
                 <StackLayout Margin="0, 16, 0, 0" Orientation="Horizontal">
                     <Label FontSize="Small" HorizontalOptions="Start"  Text="Analytics Enabled"/>
                     <Switch HorizontalOptions="EndAndExpand"  IsToggled="true" x:Name="EnabledSwitchCell" Toggled="UpdateEnabled" />
@@ -26,12 +26,12 @@
                 <Label FontSize="Medium" Text="Settings Session"/>
                 <StackLayout Margin="0, 16, 0, 0" Orientation="Horizontal">
                     <Label FontSize="Small" HorizontalOptions="Start"  Text="Enable Manual Session Tracker"/>
-                    <Switch HorizontalOptions="EndAndExpand" IsToggled="true" x:Name="EnableManualSessionTrackerSwitch" Toggled="EnableManualSessionTrackerCellEnabled" />
+                    <Switch HorizontalOptions="EndAndExpand" IsToggled="False" x:Name="EnableManualSessionTrackerSwitch" Toggled="EnableManualSessionTrackerCellEnabled" />
                 </StackLayout>
                 <Button Text="Start Session"  Padding="0, 8, 0, 8" x:Name="StartSessionButton" Clicked="StartSessionButton_Clicked"/>
             </StackLayout>
             <StackLayout Orientation="Vertical">
-                <Label FontSize="Small" Text="Country Code Settings"/>
+                <Label FontSize="Medium" Text="Country Code Settings"/>
                 <Entry Margin="0, 8, 0, 0" FontSize="Small" HorizontalTextAlignment="Start" x:Name="CountryCodeText"/>
                 <Button Text="Save Country Code"  Padding="0, 8, 0, 8" x:Name="SaveCountryCode" Clicked="SaveCountryCode_Clicked"/>
             </StackLayout>

diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AppCenterContentPage.xaml b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AppCenterContentPage.xaml
@@ -2,7 +2,7 @@
 <ContentPage Title="App Center" xmlns:local="clr-namespace:Contoso.Forms.Demo" xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="Contoso.Forms.Demo.AppCenterContentPage">
     <StackLayout Orientation="Vertical" Padding="16">
         <StackLayout Orientation="Vertical">
-            <Label Text="App Center Settings"/>
+            <Label FontSize="Medium" Text="App Center Settings"/>
             <StackLayout Margin="0, 16, 0, 0" Orientation="Horizontal">
                 <Label FontSize="Small" HorizontalOptions="Start" Text="AppCenter Enabled"/>
                 <Switch HorizontalOptions="EndAndExpand"  IsToggled="true" x:Name="AppCenterEnabledSwitchCell" Toggled="UpdateEnabled" />

diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/CrashesContentPage.xaml b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/CrashesContentPage.xaml
@@ -3,7 +3,7 @@
      <ScrollView>
         <StackLayout Orientation="Vertical" Padding="16">
             <StackLayout Orientation="Vertical">
-                <Label Text="Crashes Settings"/>
+                <Label FontSize="Medium" Text="Crashes Settings"/>
                 <StackLayout Margin="0, 8, 0, 0" Orientation="Horizontal">
                     <Label FontSize="Small" HorizontalOptions="Start"  Text="Crashes Enabled"/>
                     <Switch HorizontalOptions="EndAndExpand" IsToggled="true" x:Name="CrashesEnabledSwitchCell" Toggled="UpdateEnabled" />
@@ -25,10 +25,10 @@
                         <Label FontSize="Small" Text="Properties" HorizontalOptions="StartAndExpand" VerticalOptions="Center" />
                         <Label FontSize="Small" Text="0" HorizontalOptions="EndAndExpand" VerticalOptions="Center" TextColor="Gray" x:Name="NumPropertiesLabel" />
                     </StackLayout>
-                    <Button Padding="0, 8, 0, 8" Text="Add Property" Clicked="AddProperty" />
+                    <Button Padding="0, 8, 0, 8" Text="Add Property" Clicked="AddProperty"/>
                 </StackLayout>
                  <StackLayout Orientation="Vertical">
-                    <Label Margin="0, 8, 0, 0" Text="Test Crashes"/>
+                    <Label FontSize="Medium" Margin="0, 8, 0, 0" Text="Test Crashes"/>
                     <Button Padding="0, 8, 0, 8" Text="Generate Test Exception" Clicked="TestException" />
                     <Button Padding="0, 8, 0, 8" Text="Divide 42 by 0" Clicked="DivideByZero" />
                     <Button Padding="0, 8, 0, 8" Text="Aggregate Exception" Clicked="AggregateException" />

diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/App.xaml.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/App.xaml.cs
@@ -183,7 +183,7 @@ bool ConfirmationHandler()
                 }
                 else
                 {
-                    Current.MainPage.DisplayActionSheet("Crash detected. Send anonymous crash report?", null, null, "Send", "Always Send", "Don't Send");
+                    dialog = Current.MainPage.DisplayActionSheet("Crash detected. Send anonymous crash report?", null, null, "Send", "Always Send", "Don't Send");
                 }
                 dialog.ContinueWith((arg) =>
                 {
@@ -205,7 +205,6 @@ bool ConfirmationHandler()
                     Crashes.NotifyUserConfirmation(userConfirmationSelection);
                 });
             });
-
             return true;
         }
 

diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/AnalyticsContentPage.xaml b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/AnalyticsContentPage.xaml
@@ -4,9 +4,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="Contoso.Forms.Puppet.AnalyticsContentPage" Padding="16">
     <ScrollView>
-        <StackLayout Orientation="Vertical">
+        <StackLayout Padding="16" Orientation="Vertical">
             <StackLayout Orientation="Vertical">
-                <Label Text="Analytics Settings"/>
+                <Label FontSize="Medium" Text="Analytics Settings"/>
                 <StackLayout Margin="0, 16, 0, 0" Orientation="Horizontal">
                     <Label FontSize="Small" HorizontalOptions="Start"  Text="Analytics Enabled"/>
                     <Switch HorizontalOptions="EndAndExpand"  IsToggled="true" x:Name="EnabledSwitchCell" Toggled="UpdateEnabled" />
@@ -26,14 +26,14 @@
                 <Label FontSize="Medium" Text="Settings Session"/>
                 <StackLayout Margin="0, 16, 0, 0" Orientation="Horizontal">
                     <Label FontSize="Small" HorizontalOptions="Start"  Text="Enable Manual Session Tracker"/>
-                    <Switch HorizontalOptions="EndAndExpand" IsToggled="true" x:Name="EnableManualSessionTrackerSwitch" Toggled="EnableManualSessionTrackerCellEnabled" />
+                    <Switch HorizontalOptions="EndAndExpand" IsToggled="False" x:Name="EnableManualSessionTrackerSwitch" Toggled="EnableManualSessionTrackerCellEnabled" />
                 </StackLayout>
-                <Button Text="Start Session" x:Name="StartSessionButton" Clicked="StartSessionButton_Clicked"/>
+                <Button Text="Start Session"  Padding="0, 8, 0, 8" x:Name="StartSessionButton" Clicked="StartSessionButton_Clicked"/>
             </StackLayout>
             <StackLayout Orientation="Vertical">
-                <Label FontSize="Small" Text="Country Code Settings"/>
+                <Label FontSize="Medium" Text="Country Code Settings"/>
                 <Entry Margin="0, 8, 0, 0" FontSize="Small" HorizontalTextAlignment="Start" x:Name="CountryCodeText"/>
-                <Button Text="Save Country Code" x:Name="SaveCountryCode" Clicked="SaveCountryCode_Clicked"/>
+                <Button Text="Save Country Code"  Padding="0, 8, 0, 8" x:Name="SaveCountryCode" Clicked="SaveCountryCode_Clicked"/>
             </StackLayout>
         </StackLayout>
     </ScrollView>

diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/AppCenterContentPage.xaml b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/AppCenterContentPage.xaml
@@ -2,7 +2,7 @@
 <ContentPage Title="App Center" xmlns:local="clr-namespace:Contoso.Forms.Puppet" xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="Contoso.Forms.Puppet.AppCenterContentPage">
     <StackLayout Orientation="Vertical" Padding="16">
         <StackLayout Orientation="Vertical">
-            <Label Text="App Center Settings"/>
+            <Label FontSize="Medium" Text="App Center Settings"/>
             <StackLayout Margin="0, 16, 0, 0" Orientation="Horizontal">
                 <Label FontSize="Small" HorizontalOptions="Start" Text="AppCenter Enabled"/>
                 <Switch HorizontalOptions="EndAndExpand"  IsToggled="true" x:Name="AppCenterEnabledSwitchCell" Toggled="UpdateEnabled" />

diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CrashesContentPage.xaml b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CrashesContentPage.xaml
@@ -3,7 +3,7 @@
     <ScrollView>
         <StackLayout Orientation="Vertical" Padding="16">
             <StackLayout Orientation="Vertical">
-                <Label Text="Crashes Settings"/>
+                <Label FontSize="Medium" Text="Crashes Settings"/>
                 <StackLayout Margin="0, 8, 0, 0" Orientation="Horizontal">
                     <Label FontSize="Small" HorizontalOptions="Start"  Text="Crashes Enabled"/>
                     <Switch HorizontalOptions="EndAndExpand" IsToggled="true" x:Name="CrashesEnabledSwitchCell" Toggled="UpdateEnabled" />
@@ -28,7 +28,7 @@
                     <Button Padding="0, 8, 0, 8" Text="Add Property" Clicked="AddProperty"/>
                 </StackLayout>
                  <StackLayout Orientation="Vertical">
-                    <Label Margin="0, 8, 0, 0" Text="Test Crashes"/>
+                    <Label FontSize="Medium" Margin="0, 8, 0, 0" Text="Test Crashes"/>
                     <Button Padding="0, 8, 0, 8" Text="Generate Test Exception" Clicked="TestException" />
                     <Button Padding="0, 8, 0, 8" Text="Divide 42 by 0" Clicked="DivideByZero" />
                     <Button Padding="0, 8, 0, 8" Text="Aggregate Exception" Clicked="AggregateException" />