Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Source/OxyPlot.Maui.Skia/Platforms/iOS/MauiFontLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ public Stream Load(string fontName)
fontRegistrar = IPlatformApplication.Current.Services.GetRequiredService<IFontRegistrar>();

fontName = fontRegistrar.GetFont(fontName);
if (File.Exists(fontName))
{
if (fontName == null)
return null;
else if (File.Exists(fontName))
return File.OpenRead(fontName);
Comment thread
janusw marked this conversation as resolved.
Outdated
}

try
{
Expand Down
6 changes: 3 additions & 3 deletions Source/OxyplotMauiSample/OxyplotMauiSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<ImplicitUsings>enable</ImplicitUsings>

<!-- Display name -->
<ApplicationTitle>OxyplotMauiSimple</ApplicationTitle>
<ApplicationTitle>OxyplotMauiSample</ApplicationTitle>

<!-- App Identifier -->
<ApplicationId>com.companyname.oxyplotmauisimple</ApplicationId>
<ApplicationId>com.companyname.oxyplotmauisample</ApplicationId>
<ApplicationIdGuid>2C1CD083-05E3-4080-840A-EC3B8334CCD7</ApplicationIdGuid>

<!-- Versions -->
Expand Down Expand Up @@ -62,7 +62,7 @@

<ItemGroup>
<PackageReference Include="OxyPlot.ExampleLibrary" Version="2.2.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.40" />
Comment thread
janusw marked this conversation as resolved.
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="maui-application-id-placeholder" version="0.0.0" api-version="7" xmlns="http://tizen.org/ns/packages">
<profile name="common" />
<ui-application appid="maui-application-id-placeholder" exec="OxyplotMauiSimple.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
<ui-application appid="maui-application-id-placeholder" exec="OxyplotMauiSample.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
<label>maui-application-title-placeholder</label>
<icon>maui-appicon-placeholder</icon>
<metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
Expand Down
2 changes: 1 addition & 1 deletion Source/OxyplotMauiSample/Platforms/Windows/app.manifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.0.0.0" name="OxyplotMauiSimple.WinUI.app"/>
<assemblyIdentity version="1.0.0.0" name="OxyplotMauiSample.WinUI.app"/>

<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
Expand Down
Loading