Improvements to the samples for v1.60
This commit is contained in:
Matthew Leibowitz
Родитель
f8da6f7e0e
Коммит
f8ce844fd8
|
|
@ -17,7 +17,7 @@
|
|||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
|
||||
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
|
||||
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
|
||||
<AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
|
|
@ -53,13 +53,11 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
|
||||
<PackageReference Include="PCLStorage" Version="1.0.2" />
|
||||
<PackageReference Include="SkiaSharp" Version="1.60.0" />
|
||||
<PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
|
||||
<PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
|
||||
<PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
|
||||
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="2.4.0.18342" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="2.4.0.91020" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Core\Core.csproj">
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:versionCode="10551010"
|
||||
android:versionCode="1600000"
|
||||
android:installLocation="auto"
|
||||
android:versionName="1.55.1.0"
|
||||
android:versionName="1.60.0.0"
|
||||
package="com.xamarin.skia_forms_demo">
|
||||
<uses-sdk android:minSdkVersion="15" />
|
||||
<application android:label="SkiaSharp for Xamarin.Forms"
|
||||
|
|
|
|||
|
|
@ -1,92 +1,31 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{E01FBABA-8DA1-432B-9253-F4ABE13A3A6A}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<TargetFramework>netstandard1.3</TargetFramework>
|
||||
<OutputTypeEx>library</OutputTypeEx>
|
||||
<RootNamespace>SkiaSharpSample.FormsSample</RootNamespace>
|
||||
<AssemblyName>SkiaSharpSample.FormsSample</AssemblyName>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
|
||||
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>TRACE;DEBUG;NET_STANDARD</DefineConstants>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>TRACE;NET_STANDARD</DefineConstants>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
|
||||
<PackageReference Include="PCLStorage" Version="1.0.2" />
|
||||
<PackageReference Include="SkiaSharp" Version="1.60.0" />
|
||||
<PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
|
||||
<PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
|
||||
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="2.4.0.18342" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="2.4.0.91020" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="App.xaml.cs">
|
||||
<DependentUpon>App.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DetailContentsPage.xaml.cs">
|
||||
<DependentUpon>DetailContentsPage.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DetailsPage.xaml.cs">
|
||||
<DependentUpon>DetailsPage.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="MainPage.xaml.cs">
|
||||
<DependentUpon>MainPage.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="MasterPage.xaml.cs">
|
||||
<DependentUpon>MasterPage.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="MainPage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="App.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="DetailContentsPage.xaml">
|
||||
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="MasterPage.xaml">
|
||||
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="DetailsPage.xaml">
|
||||
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<None Remove="**\*.xaml" />
|
||||
<Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
|
||||
<EmbeddedResource Include="**\*.xaml" SubType="Designer" Generator="MSBuild:UpdateDesignTimeXaml" />
|
||||
</ItemGroup>
|
||||
<Import Project="..\..\SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems" Label="Shared" />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
|
||||
</Project>
|
||||
|
|
@ -31,13 +31,13 @@ namespace SkiaSharpSample.FormsSample
|
|||
|
||||
private static SampleBase[] GetPlatformSamples()
|
||||
{
|
||||
switch (Device.OS)
|
||||
switch (Device.RuntimePlatform)
|
||||
{
|
||||
case TargetPlatform.iOS:
|
||||
case Device.iOS:
|
||||
return SamplesManager.GetSamples(SamplePlatforms.iOS).ToArray();
|
||||
case TargetPlatform.Android:
|
||||
case Device.Android:
|
||||
return SamplesManager.GetSamples(SamplePlatforms.Android).ToArray();
|
||||
case TargetPlatform.Windows:
|
||||
case Device.UWP:
|
||||
return SamplesManager.GetSamples(SamplePlatforms.UWP).ToArray();
|
||||
default:
|
||||
return SamplesManager.GetSamples(SamplePlatforms.All).ToArray();
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
using System.Resources;
|
||||
using System.Reflection;
|
||||
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("SkiaSharpSample.FormsSample")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("SkiaSharpSample.FormsSample")]
|
||||
[assembly: AssemblyCopyright("Copyright © Xamarin Inc. 2016")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
[assembly: NeutralResourcesLanguage("en")]
|
||||
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
|
|
@ -6,10 +6,6 @@
|
|||
<string>SkiaSharp for Xamarin.Forms</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.skiasharp.samples.forms</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>10.10</string>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
|
|
@ -26,5 +22,9 @@
|
|||
<string>NSApplication</string>
|
||||
<key>XSAppIconAssets</key>
|
||||
<string>Assets.xcassets/AppIcon.appiconset</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.60.0.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1600000</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
|
|||
|
|
@ -58,11 +58,10 @@
|
|||
<PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
|
||||
<PackageReference Include="SkiaSharp" Version="1.60.0" />
|
||||
<PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
|
||||
<PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
|
||||
<PackageReference Include="SkiaSharp.Extended" Version="1.59.0" />
|
||||
<PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
|
||||
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="2.4.0.18342" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="2.4.0.91020" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Core\Core.csproj">
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
|
||||
<Identity Name="51681.NETDevelopmentAddic.Skia.UWP.Demo" Publisher="CN=B0BB84CF-0033-49C8-BB54-7D95062245A2" Version="1.59.2.0" />
|
||||
<Identity Name="51681.NETDevelopmentAddic.Skia.UWP.Demo" Publisher="CN=B0BB84CF-0033-49C8-BB54-7D95062245A2" Version="1.60.0.0" />
|
||||
<mp:PhoneIdentity PhoneProductId="dd526c48-8071-4f73-b3b6-3a5fb140a870" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
|
||||
<Properties>
|
||||
<DisplayName>SkiaSharp for Xamarin.Forms</DisplayName>
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
|
||||
<AppxBundle>Always</AppxBundle>
|
||||
<AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
|
||||
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
|
|
@ -93,13 +94,13 @@
|
|||
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="5.0.0" />
|
||||
<PackageReference Include="PCLStorage" Version="1.0.2" />
|
||||
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.2" />
|
||||
<PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
|
||||
<PackageReference Include="SkiaSharp" Version="1.60.0" />
|
||||
<PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
|
||||
<PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
|
||||
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
|
||||
<PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="2.4.0.91020" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Core\Core.csproj">
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"HarfBuzzSharp": "1.4.6",
|
||||
"Microsoft.NETCore.UniversalWindowsPlatform": "5.4.0",
|
||||
"PCLStorage": "1.0.2",
|
||||
"SkiaSharp": "1.60.0",
|
||||
"SkiaSharp.HarfBuzz": "1.60.0-beta",
|
||||
"SkiaSharp.Svg": "1.59.0",
|
||||
"SkiaSharp.Views": "1.60.0",
|
||||
"SkiaSharp.Views.Forms": "1.60.0",
|
||||
"Xamarin.Forms": "2.4.0.18342"
|
||||
},
|
||||
"frameworks": {
|
||||
"uap10.0.10240": {}
|
||||
},
|
||||
"runtimes": {
|
||||
"win10-arm": {},
|
||||
"win10-arm-aot": {},
|
||||
"win10-x86": {},
|
||||
"win10-x86-aot": {},
|
||||
"win10-x64": {},
|
||||
"win10-x64-aot": {}
|
||||
}
|
||||
}
|
||||
|
|
@ -28,13 +28,13 @@
|
|||
<key>CFBundleIdentifier</key>
|
||||
<string>com.skiasharp.samples.forms</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>10551010</string>
|
||||
<string>1600000</string>
|
||||
<key>CFBundleIconFiles</key>
|
||||
<array/>
|
||||
<key>UILaunchStoryboardName</key>
|
||||
<string>LaunchScreen</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.55.1.0</string>
|
||||
<string>1.60.0.0</string>
|
||||
<key>UIStatusBarTintParameters</key>
|
||||
<dict>
|
||||
<key>UINavigationBar</key>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
<RootNamespace>SkiaSharpSample.FormsSample.Platform</RootNamespace>
|
||||
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
|
||||
<AssemblyName>SkiaSharpSampleFormsSampleiOS</AssemblyName>
|
||||
<NuGetPackageImportStamp></NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
|
|
@ -114,13 +113,11 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
|
||||
<PackageReference Include="PCLStorage" Version="1.0.2" />
|
||||
<PackageReference Include="SkiaSharp" Version="1.60.0" />
|
||||
<PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
|
||||
<PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
|
||||
<PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
|
||||
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="2.4.0.18342" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="2.4.0.91020" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Core\Core.csproj">
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@
|
|||
<key>CFBundleIdentifier</key>
|
||||
<string>com.companyname.skiasharpsample-macsample</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.55.1.0</string>
|
||||
<string>1.60.0.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>10551010</string>
|
||||
<string>1600000</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>10.10</string>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@
|
|||
<PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
|
||||
<PackageReference Include="SkiaSharp" Version="1.60.0" />
|
||||
<PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
|
||||
<PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
|
||||
<PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ namespace SkiaSharpSample
|
|||
var controller = UIDocumentInteractionController.FromUrl(resourceToOpen);
|
||||
if (!controller.PresentOpenInMenu(vc.View.Bounds, vc.View, true))
|
||||
{
|
||||
new UIAlertView("SkiaSharp", "Unable to open file.", null, "OK").Show();
|
||||
new UIAlertView("SkiaSharp", "Unable to open file.", (IUIAlertViewDelegate)null, "OK").Show();
|
||||
}
|
||||
#elif __ANDROID__
|
||||
// the external / shared location
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using SkiaSharp;
|
||||
using SKSvg = SkiaSharp.Extended.Svg.SKSvg;
|
||||
|
||||
namespace SkiaSharpSample.Samples
|
||||
{
|
||||
[Preserve(AllMembers = true)]
|
||||
public class SvgSample : SampleBase
|
||||
{
|
||||
private SKSvg svg;
|
||||
|
||||
[Preserve]
|
||||
public SvgSample()
|
||||
{
|
||||
}
|
||||
|
||||
public override string Title => "SVG";
|
||||
|
||||
public override SampleCategories Category => SampleCategories.BitmapDecoding | SampleCategories.SVG;
|
||||
|
||||
protected override Task OnInit()
|
||||
{
|
||||
svg = new SKSvg();
|
||||
using (var stream = SampleMedia.Images.LogosSvg)
|
||||
svg.Load(stream);
|
||||
|
||||
return base.OnInit();
|
||||
}
|
||||
|
||||
protected override void OnDrawSample(SKCanvas canvas, int width, int height)
|
||||
{
|
||||
canvas.Clear(SKColors.White);
|
||||
|
||||
float canvasMin = Math.Min(width, height);
|
||||
float svgMax = Math.Max(svg.Picture.CullRect.Width, svg.Picture.CullRect.Height);
|
||||
float scale = canvasMin / svgMax;
|
||||
var matrix = SKMatrix.MakeScale(scale, scale);
|
||||
|
||||
canvas.DrawPicture(svg.Picture, ref matrix);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using SkiaSharp;
|
||||
using SKSvg = SkiaSharp.Extended.Svg.SKSvg;
|
||||
|
||||
namespace SkiaSharpSample.Samples
|
||||
{
|
||||
[Preserve(AllMembers = true)]
|
||||
public class SvgTransparencySample : SampleBase
|
||||
{
|
||||
private SKSvg svg;
|
||||
|
||||
[Preserve]
|
||||
public SvgTransparencySample()
|
||||
{
|
||||
}
|
||||
|
||||
public override string Title => "SVG Transparency";
|
||||
|
||||
public override SampleCategories Category => SampleCategories.BitmapDecoding | SampleCategories.SVG;
|
||||
|
||||
protected override Task OnInit()
|
||||
{
|
||||
svg = new SKSvg();
|
||||
using (var stream = SampleMedia.Images.OpacitySvg)
|
||||
svg.Load(stream);
|
||||
|
||||
return base.OnInit();
|
||||
}
|
||||
|
||||
protected override void OnDrawSample(SKCanvas canvas, int width, int height)
|
||||
{
|
||||
canvas.Clear(SKColors.White);
|
||||
|
||||
float canvasMin = Math.Min(width, height);
|
||||
float svgMax = Math.Max(svg.Picture.CullRect.Width, svg.Picture.CullRect.Height);
|
||||
float scale = canvasMin / svgMax;
|
||||
var matrix = SKMatrix.MakeScale(scale, scale);
|
||||
|
||||
canvas.DrawPicture(svg.Picture, ref matrix);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -26,7 +26,6 @@
|
|||
<Compile Include="$(MSBuildThisFileDirectory)Samples\ManipulatedBitmapShaderSample.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Samples\PathMeasureSample.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Samples\PathConicToQuadsSample.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Samples\SvgSample.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Samples\XamagonSample.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Samples\TextSample.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Samples\GradientSample.cs" />
|
||||
|
|
@ -58,7 +57,6 @@
|
|||
<Compile Include="$(MSBuildThisFileDirectory)Samples\ErodeImageFilterSample.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Samples\ColorTableColorFilterSample.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Samples\PathEffect2DPathSample.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Samples\SvgTransparencySample.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Samples\TextShapingSample.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Samples\HighContrastColorFilterSample.cs" />
|
||||
</ItemGroup>
|
||||
|
|
@ -71,9 +69,13 @@
|
|||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Media\nine-patch.png" />
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Media\logos.svg" />
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Media\animated-heart.gif" />
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Media\opacity.svg" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="$(MSBuildThisFileDirectory)Media\content-font.ttf" />
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Media\opacity.svg" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="$(MSBuildThisFileDirectory)Media\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)Samples\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -9,9 +9,9 @@
|
|||
<key>CFBundleIdentifier</key>
|
||||
<string>com.companyname.skiasharpsample-tvsample</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<string>1.60.0.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.0</string>
|
||||
<string>1600000</string>
|
||||
<key>MinimumOSVersion</key>
|
||||
<string>9.0</string>
|
||||
<key>UIDeviceFamily</key>
|
||||
|
|
|
|||
|
|
@ -89,7 +89,6 @@
|
|||
<PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
|
||||
<PackageReference Include="SkiaSharp" Version="1.60.0" />
|
||||
<PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
|
||||
<PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
|
||||
<PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
|
||||
<Identity Name="792efd03-834f-4a7f-9997-56d6cc91b3d7" Publisher="CN=Matthew" Version="1.0.0.0" />
|
||||
<Identity Name="792efd03-834f-4a7f-9997-56d6cc91b3d7" Publisher="CN=Matthew" Version="1.60.0.0" />
|
||||
<mp:PhoneIdentity PhoneProductId="792efd03-834f-4a7f-9997-56d6cc91b3d7" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
|
||||
<Properties>
|
||||
<DisplayName>SkiaSharpSample.UWPSample</DisplayName>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<PackageCertificateKeyFile>UWPSample_TemporaryKey.pfx</PackageCertificateKeyFile>
|
||||
<PackageCertificateThumbprint>2022055027C3EEA154DFF420144910E67613D8D6</PackageCertificateThumbprint>
|
||||
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
|
|
@ -89,12 +90,10 @@
|
|||
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="5.0.0" />
|
||||
<PackageReference Include="PCLStorage" Version="1.0.2" />
|
||||
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.2" />
|
||||
<PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
|
||||
<PackageReference Include="SkiaSharp" Version="1.60.0" />
|
||||
<PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
|
||||
<PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
|
||||
<PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"HarfBuzzSharp": "1.4.6",
|
||||
"Microsoft.NETCore.UniversalWindowsPlatform": "5.4.0",
|
||||
"PCLStorage": "1.0.2",
|
||||
"SkiaSharp": "1.60.0",
|
||||
"SkiaSharp.HarfBuzz": "1.60.0-beta",
|
||||
"SkiaSharp.Svg": "1.59.0",
|
||||
"SkiaSharp.Views": "1.60.0"
|
||||
},
|
||||
"frameworks": {
|
||||
"uap10.0": {}
|
||||
},
|
||||
"runtimes": {
|
||||
"win10-arm": {},
|
||||
"win10-arm-aot": {},
|
||||
"win10-x86": {},
|
||||
"win10-x86-aot": {},
|
||||
"win10-x64": {},
|
||||
"win10-x64-aot": {}
|
||||
}
|
||||
}
|
||||
|
|
@ -97,10 +97,8 @@
|
|||
<PackageReference Include="OpenTK" Version="1.1.2349.61993" />
|
||||
<PackageReference Include="OpenTK.GLControl" Version="1.1.2349.61993" />
|
||||
<PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
|
||||
<PackageReference Include="PCLStorage" Version="1.0.2" />
|
||||
<PackageReference Include="SkiaSharp" Version="1.60.0" />
|
||||
<PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
|
||||
<PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
|
||||
<PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<string>1.60.0.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.0</string>
|
||||
<string>1600000</string>
|
||||
<key>MinimumOSVersion</key>
|
||||
<string>2.0</string>
|
||||
<key>UISupportedInterfaceOrientations</key>
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<string>1.60.0.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.0</string>
|
||||
<string>1600000</string>
|
||||
<key>MinimumOSVersion</key>
|
||||
<string>2.0</string>
|
||||
<key>NSExtension</key>
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@
|
|||
<key>CFBundleIdentifier</key>
|
||||
<string>com.companyname.WatchSample</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<string>1.60.0.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.0</string>
|
||||
<string>1600000</string>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
<true/>
|
||||
<key>MinimumOSVersion</key>
|
||||
|
|
|
|||
|
|
@ -91,10 +91,8 @@
|
|||
<PackageReference Include="OpenTK" Version="1.1.2349.61993" />
|
||||
<PackageReference Include="OpenTK.GLControl" Version="1.1.2349.61993" />
|
||||
<PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
|
||||
<PackageReference Include="PCLStorage" Version="1.0.2" />
|
||||
<PackageReference Include="SkiaSharp" Version="1.60.0" />
|
||||
<PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
|
||||
<PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
|
||||
<PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче