Added to frame samples and updated screenshot

UserInterface/FrameDemos/FrameDemos/FrameDemos.Android/FrameDemos.Android.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -83,7 +83,6 @@
     <AndroidResource Include="Resources\mipmap-xxxhdpi\launcher_foreground.png" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Resources\drawable\" />
     <Folder Include="Resources\drawable-hdpi\" />
     <Folder Include="Resources\drawable-xhdpi\" />
     <Folder Include="Resources\drawable-xxhdpi\" />
@@ -95,5 +94,8 @@
       <Name>FrameDemos</Name>
     </ProjectReference>
   </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\outdoors.jpg" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

UserInterface/FrameDemos/FrameDemos/FrameDemos.UWP/FrameDemos.UWP.csproj

@@ -130,6 +130,7 @@
     <Content Include="Assets\Wide310x150Logo.scale-100.png" />
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
     <Content Include="Assets\Wide310x150Logo.scale-400.png" />
+    <Content Include="outdoors.jpg" />
     <Content Include="Properties\Default.rd.xml" />
   </ItemGroup>
   <ItemGroup>
@@ -144,7 +145,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms" Version="4.1.0.555618" />
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.9"/>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.9" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FrameDemos\FrameDemos.csproj">

UserInterface/FrameDemos/FrameDemos/FrameDemos.iOS/Assets.xcassets/outdoors.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images": [
+    {
+      "scale": "2x",
+      "idiom": "universal"
+    },
+    {
+      "scale": "3x",
+      "idiom": "universal"
+    },
+    {
+      "scale": "1x",
+      "idiom": "universal",
+      "filename": "outdoors.jpg"
+    }
+  ],
+  "properties": {},
+  "info": {
+    "version": 1,
+    "author": ""
+  }
+}

UserInterface/FrameDemos/FrameDemos/FrameDemos.iOS/FrameDemos.iOS.csproj

@@ -71,6 +71,12 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ImageAsset Include="Assets.xcassets\outdoors.imageset\Contents.json">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\outdoors.imageset\outdoors.jpg">
+      <Visible>false</Visible>
+    </ImageAsset>
     <InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
     <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
       <Visible>false</Visible>

UserInterface/FrameDemos/FrameDemos/FrameDemos/FrameCodePage.cs

@@ -9,33 +9,12 @@ namespace FrameDemos
             Padding = 10;
             Title = "Frame Code Demo";
 
-            Frame frame1 = new Frame
+            Frame defaultFrame = new Frame
             {
                 Content = new Label { Text = "Default" }
             };
 
-            Frame frame2 = new Frame
-            {
-                BorderColor = Color.Orange,
-                Content = new Label { Text = "BorderColor" },
-            };
-
-            Frame frame3 = new Frame
-            {
-                BorderColor = Color.Orange,
-                Content = new Label { Text = "CornerRadius" },
-                CornerRadius = 10
-            };
-
-            Frame frame4 = new Frame
-            {
-                BackgroundColor = Color.LightGray,
-                BorderColor = Color.Orange,
-                Content = new Label { Text = "BackgroundColor" },
-                CornerRadius = 10
-            };
-
-            Frame frame5 = new Frame
+            Frame noShadowFrame = new Frame
             {
                 BackgroundColor = Color.LightGray,
                 BorderColor = Color.Orange,
@@ -44,7 +23,7 @@ namespace FrameDemos
                 HasShadow = false
             };
 
-            Frame frame6 = new Frame
+            Frame forceShadowFrame = new Frame
             {
                 BackgroundColor = Color.LightGray,
                 BorderColor = Color.Orange,
@@ -53,6 +32,26 @@ namespace FrameDemos
                 HasShadow = true
             };
 
+            Frame circleImageFrame = new Frame
+            {
+                Margin = 10,
+                BorderColor = Color.Black,
+                CornerRadius = 50,
+                HeightRequest = 60,
+                WidthRequest = 60,
+                IsClippedToBounds = true,
+                HorizontalOptions = LayoutOptions.Center,
+                VerticalOptions = LayoutOptions.Center,
+                Content = new Image
+                {
+                    Source = ImageSource.FromFile("outdoors.jpg"),
+                    Aspect = Aspect.AspectFill,
+                    Margin = -20,
+                    HeightRequest = 100,
+                    WidthRequest = 100
+                }
+            };
+
             Frame cardFrame = new Frame
             {
                 BorderColor = Color.Gray,
@@ -88,12 +87,10 @@ namespace FrameDemos
                 {
                     Children =
                     {
-                        frame1,
-                        frame2,
-                        frame3,
-                        frame4,
-                        frame5,
-                        frame6,
+                        defaultFrame,
+                        noShadowFrame,
+                        forceShadowFrame,
+                        circleImageFrame,
                         cardFrame
                     }
                 }

UserInterface/FrameDemos/FrameDemos/FrameDemos/FrameXamlPage.xaml

@@ -13,18 +13,6 @@
         <Frame>
           <Label Text="Default" />
         </Frame>
-        <Frame BorderColor="Orange" >
-          <Label Text="BorderColor" />
-        </Frame>
-        <Frame BorderColor="Orange"
-               CornerRadius="10">
-          <Label Text="CornerRadius" />
-        </Frame>
-        <Frame BackgroundColor="LightGray"
-               BorderColor="Orange"
-               CornerRadius="10">
-          <Label Text="BackgroundColor" />
-        </Frame>
         <Frame BackgroundColor="LightGray"
                BorderColor="Orange"
                CornerRadius="10"
@@ -37,6 +25,20 @@
                HasShadow="True">
           <Label Text="HasShadow True (platform dependent)" />
         </Frame>
+        <Frame Margin="10"
+               BorderColor="Black"
+               CornerRadius="50"
+               HeightRequest="60"
+               WidthRequest="60"
+               IsClippedToBounds="True"
+               HorizontalOptions="Center"
+               VerticalOptions="Center">
+          <Image Source="outdoors.jpg"
+                 Aspect="AspectFill"
+                 Margin="-20"
+                 HeightRequest="100"
+                 WidthRequest="100" />
+        </Frame>
         <Frame BorderColor="Gray"
                CornerRadius="5"
                Padding="8">