chore: update to latest forms/visual

rdavisau · rdavisau · commit 39b0518690ee · 2019-05-05T22:17:33.000+10:00
diff --git a/VisualChallenge/VisualChallenge.Android/VisualChallenge.Android.csproj b/VisualChallenge/VisualChallenge.Android/VisualChallenge.Android.csproj
@@ -48,10 +48,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.0.0.293082-pre8" />
-    <PackageReference Include="Xamarin.Forms.Visual.Material">
-      <Version>4.0.0.293082-pre8</Version>
-    </PackageReference>
+    <PackageReference Include="Xamarin.Forms" Version="4.0.0.394984-pre10" />
+    <PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.0.0.394984-pre10" />  
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
diff --git a/VisualChallenge/VisualChallenge.iOS/VisualChallenge.iOS.csproj b/VisualChallenge/VisualChallenge.iOS/VisualChallenge.iOS.csproj
@@ -180,10 +180,8 @@
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.0.0.293082-pre8" />
-    <PackageReference Include="Xamarin.Forms.Visual.Material">
-      <Version>4.0.0.293082-pre8</Version>
-    </PackageReference>
+    <PackageReference Include="Xamarin.Forms" Version="4.0.0.394984-pre10" />
+    <PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.0.0.394984-pre10" />  
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>
diff --git a/VisualChallenge/VisualChallenge/AppShell.xaml b/VisualChallenge/VisualChallenge/AppShell.xaml
@@ -41,19 +41,19 @@
     </ShellSection>
     
     <ShellSection Title="TRIPS" Icon="ic_trip.png">
-        <ShellContent ContentTemplate="{DataTemplate local:VisualChallengePage}"/>
+        <ShellContent ContentTemplate="{DataTemplate ContentPage}"/>
     </ShellSection>
     
     <ShellSection Title="BOOK" Icon="ic_plane.png">
-        <ShellContent ContentTemplate="{DataTemplate local:VisualChallengePage}"/>
+        <ShellContent ContentTemplate="{DataTemplate ContentPage}"/>
     </ShellSection>
     
     <ShellSection Title="DEALS" Icon="ic_offer.png">
-        <ShellContent ContentTemplate="{DataTemplate local:VisualChallengePage}"/>
+        <ShellContent ContentTemplate="{DataTemplate ContentPage}"/>
     </ShellSection>
     
     <ShellSection Title="MY QFF" Icon="ic_person_black_24dp.png">
-        <ShellContent ContentTemplate="{DataTemplate local:VisualChallengePage}"/>
+        <ShellContent ContentTemplate="{DataTemplate ContentPage}"/>
     </ShellSection>
 
 </ShellItem>
diff --git a/VisualChallenge/VisualChallenge/VisualChallenge.csproj b/VisualChallenge/VisualChallenge/VisualChallenge.csproj
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.0.1.206893" />
-    <PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.0.1.206893" />  
+    <PackageReference Include="Xamarin.Forms" Version="4.0.0.394984-pre10" />
+    <PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.0.0.394984-pre10" />  
   </ItemGroup>
 
   <ItemGroup>
diff --git a/VisualChallenge/VisualChallenge/VisualChallengePage.cs b/VisualChallenge/VisualChallenge/VisualChallengePage.cs
@@ -18,31 +18,26 @@ public class VisualChallengePage : ContentPage
                 ? "Ciutadella-Md"
                 : "ciutadella_medium.ttf#Regular";
 
-        protected override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            Xamarin.Forms.NavigationPage.SetHasNavigationBar(this, false);
-        } 
-
         public VisualChallengePage()
         {
-            On<iOS>().SetUseSafeArea(false);
-
+            TranslationY = Offset;
             BackgroundColor = QantasLightGray;
             Visual = VisualMarker.Material;
-            TranslationY = -1;
-            
+
+            On<iOS>().SetUseSafeArea(false);
+            Shell.SetNavBarIsVisible(this, false);
+
             Content = GetContent();
         }
 
         private View GetContent() =>
             new Xamarin.Forms.ScrollView
             {
-                Margin = 0,
+                Margin = new Thickness(0, Inset, 0, Inset),
                 Content =
-                    new StackLayout
+                    new StackLayout 
                     {
+                        Margin = new Thickness(0, Inset, 0, 0),
                         Children =
                         {
                             HeaderView(),
@@ -346,5 +341,8 @@ public View TripInteractionCell(string icon, string text) =>
                     }
                 } 
             };
+
+        public int Inset => Device.RuntimePlatform == Device.iOS ? -24 : -12;
+        public int Offset => Device.RuntimePlatform == Device.iOS ? -20 : 0;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,31 +18,26 @@ public class VisualChallengePage : ContentPage`
`18`	`18`	`? "Ciutadella-Md"`
`19`	`19`	`: "ciutadella_medium.ttf#Regular";`
`20`	`20`
`21`		`- protected override void OnAppearing()`
`22`		`- {`
`23`		`- base.OnAppearing();`
`24`		`-`
`25`		`- Xamarin.Forms.NavigationPage.SetHasNavigationBar(this, false);`
`26`		`- }`
`27`		`-`
`28`	`21`	`public VisualChallengePage()`
`29`	`22`	`{`
`30`		`- On<iOS>().SetUseSafeArea(false);`
`31`		`-`
	`23`	`+ TranslationY = Offset;`
`32`	`24`	`BackgroundColor = QantasLightGray;`
`33`	`25`	`Visual = VisualMarker.Material;`
`34`		`- TranslationY = -1;`
`35`		`-`
	`26`	`+`
	`27`	`+ On<iOS>().SetUseSafeArea(false);`
	`28`	`+ Shell.SetNavBarIsVisible(this, false);`
	`29`	`+`
`36`	`30`	`Content = GetContent();`
`37`	`31`	`}`
`38`	`32`
`39`	`33`	`private View GetContent() =>`
`40`	`34`	`new Xamarin.Forms.ScrollView`
`41`	`35`	`{`
`42`		`- Margin = 0,`
	`36`	`+ Margin = new Thickness(0, Inset, 0, Inset),`
`43`	`37`	`Content =`
`44`		`- new StackLayout`
	`38`	`+ new StackLayout`
`45`	`39`	`{`
	`40`	`+ Margin = new Thickness(0, Inset, 0, 0),`
`46`	`41`	`Children =`
`47`	`42`	`{`
`48`	`43`	`HeaderView(),`
`@@ -346,5 +341,8 @@ public View TripInteractionCell(string icon, string text) =>`
`346`	`341`	`}`
`347`	`342`	`}`
`348`	`343`	`};`
	`344`	`+`
	`345`	`+ public int Inset => Device.RuntimePlatform == Device.iOS ? -24 : -12;`
	`346`	`+ public int Offset => Device.RuntimePlatform == Device.iOS ? -20 : 0;`
`349`	`347`	`}`
`350`	`348`	`}`