Skip to content

Reverting FindIconForKey to return null if no icon found (Issue #119 and #28) #121

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
jsmarcus merged 3 commits into from
Jan 18, 2019
Merged

Reverting FindIconForKey to return null if no icon found (Issue #119 and #28) #121

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e525bb
Merged in Font Awesome Free 5.3.1
EndlessDelirium Sep 13, 2018
047e5b7
Merge https://github.com/jsmarcus/Iconize
EndlessDelirium Jan 10, 2019
9efb156
Reverted behavior of FindIconForKey back to return null whenever no s…
EndlessDelirium Jan 11, 2019
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
7 changes: 2 additions & 5 deletions src/Plugin.Iconize/Iconize.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,10 @@ public static IIconModule FindModuleOf(IIcon icon)
/// <returns>The icon, or null if no icon matches the key</returns>
public static IIcon FindIconForKey(String iconKey)
{
if (iconKey is null)
throw new ArgumentNullException(nameof(iconKey));

if (String.IsNullOrWhiteSpace(iconKey))
throw new ArgumentException($"{nameof(iconKey)} cannot be empty", nameof(iconKey));
return null;

return Modules?.FirstOrDefault(x => x.Keys.Contains(iconKey))?.GetIcon(iconKey) ?? throw new NullReferenceException($"No icon with the key: {iconKey}");
return Modules?.FirstOrDefault(x => x.Keys.Contains(iconKey))?.GetIcon(iconKey);
}
}
}