Skip to content

Fix crash of sample app #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janusw merged 4 commits into from
Feb 15, 2026
Merged

Fix crash of sample app #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6744630
fix a NullReferenceException on iOS
janusw Feb 15, 2026
d3d3f9a
OxyplotMauiSample: fix typo in app name
janusw Feb 15, 2026
cc4b097
OxyplotMauiSample: update MAUI to 10.0.40
janusw Feb 15, 2026
86646c8
MauiFontLoader.Load: use fontName as fallback if GetFont fails (on iOS)
janusw Feb 15, 2026
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
8 changes: 4 additions & 4 deletions Source/OxyPlot.Maui.Skia/Platforms/MacCatalyst/MauiFontLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ public Stream Load(string fontName)
if (fontRegistrar == null)
fontRegistrar = IPlatformApplication.Current.Services.GetRequiredService<IFontRegistrar>();

fontName = fontRegistrar.GetFont(fontName);
if (File.Exists(fontName))
{
fontName = fontRegistrar.GetFont(fontName) ?? fontName;
if (fontName == null)
return null;
else if (File.Exists(fontName))
return File.OpenRead(fontName);
}

try
{
Expand Down
8 changes: 4 additions & 4 deletions Source/OxyPlot.Maui.Skia/Platforms/iOS/MauiFontLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ public Stream Load(string fontName)
if (fontRegistrar == null)
fontRegistrar = IPlatformApplication.Current.Services.GetRequiredService<IFontRegistrar>();

fontName = fontRegistrar.GetFont(fontName);
if (File.Exists(fontName))
{
fontName = fontRegistrar.GetFont(fontName) ?? fontName;
if (fontName == null)
return null;
else if (File.Exists(fontName))
return File.OpenRead(fontName);
}

try
{
Expand Down
6 changes: 3 additions & 3 deletions Source/OxyplotMauiSample/OxyplotMauiSample.csproj
View file
Open in desktop
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" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/OxyplotMauiSample/Platforms/Tizen/tizen-manifest.xml
View file
Open in desktop
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
View file
Open in desktop
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