Skip to content
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

Jump to bottom

Multi Icon Support for Buttons and Labels #148

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Multi Icon Support for Buttons and Labels #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 19 additions & 9 deletions src/Plugin.Iconize/Platform/Android/Renderers/IconButtonRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,24 +124,34 @@ private void UpdateText()
#if USE_FASTRENDERERS
TextChanged -= OnTextChanged;

var icon = Iconize.FindIconForKey(Button.Text);
if (!(icon is null))
var icons = Element.Text.Split("|");
var controlText = string.Empty;
foreach (var iconText in icons)
{
Text = $"{icon.Character}";
Typeface = Iconize.FindModuleOf(icon).ToTypeface(Context);
var icon = Iconize.FindIconForKey(iconText);
if (!(icon is null))
{
Text += $"{icon.Character}";
Typeface = Iconize.FindModuleOf(icon).ToTypeface(Context);
}
}

TextChanged += OnTextChanged;
#else
if (!(Control is null))
{
Control.TextChanged -= OnTextChanged;

var icon = Iconize.FindIconForKey(Button.Text);
if (!(icon is null))
var icons = Element.Text.Split("|");
var controlText = string.Empty;
foreach (var iconText in icons)
{
Control.Text = $"{icon.Character}";
Control.Typeface = Iconize.FindModuleOf(icon).ToTypeface(Context);
var icon = Iconize.FindIconForKey(iconText);
if (!(icon is null))
{
Control.Text += $"{icon.Character}";
Control.Typeface = Iconize.FindModuleOf(icon).ToTypeface(Context);
}
}

Control.TextChanged += OnTextChanged;
Expand Down
28 changes: 19 additions & 9 deletions src/Plugin.Iconize/Platform/Android/Renderers/IconLabelRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,24 +110,34 @@ private void UpdateText()
#if USE_FASTRENDERERS
TextChanged -= OnTextChanged;

var icon = Iconize.FindIconForKey(Label.Text);
if (!(icon is null))
var icons = Element.Text.Split("|");
var controlText = string.Empty;
foreach (var iconText in icons)
{
Text = $"{icon.Character}";
Typeface = Iconize.FindModuleOf(icon).ToTypeface(Context);
var icon = Iconize.FindIconForKey(iconText);
if (!(icon is null))
{
Text += $"{icon.Character}";
Typeface = Iconize.FindModuleOf(icon).ToTypeface(Context);
}
}

TextChanged += OnTextChanged;
#else
if (!(Control is null))
{
Control.TextChanged -= OnTextChanged;

var icon = Iconize.FindIconForKey(Label.Text);
if (!(icon is null))
var icons = Element.Text.Split("|");
var controlText = string.Empty;
foreach (var iconText in icons)
{
Control.Text = $"{icon.Character}";
Control.Typeface = Iconize.FindModuleOf(icon).ToTypeface(Context);
var icon = Iconize.FindIconForKey(iconText);
if (!(icon is null))
{
Control.Text += $"{icon.Character}";
Control.Typeface = Iconize.FindModuleOf(icon).ToTypeface(Context);
}
}

Control.TextChanged += OnTextChanged;
Expand Down
20 changes: 14 additions & 6 deletions src/Plugin.Iconize/Platform/iOS/Renderers/IconButtonRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,24 @@ protected override void OnElementPropertyChanged(Object sender, PropertyChangedE
/// </summary>
private void UpdateText()
{
var icon = Iconize.FindIconForKey(Element.Text);
if (!(icon is null))
var icons = Element.Text.Split("|");
UIFont font = null;
var controlText = string.Empty;
foreach (var iconText in icons)
{
var font = Iconize.FindModuleOf(icon)?.ToUIFont((nfloat)Element.FontSize);
if (!(font is null))
var icon = Iconize.FindIconForKey(iconText);
if (!(icon is null))
{
Control.SetTitle($"{icon.Character}", UIControlState.Normal);
Control.Font = font;
font = Iconize.FindModuleOf(icon)?.ToUIFont((nfloat)Element.FontSize);
controlText += icon.Character;
}
}

if (!(font is null))
{
Control.SetTitle($"{controlText}", UIControlState.Normal);
Control.Font = font;
}
}
}
}
19 changes: 12 additions & 7 deletions src/Plugin.Iconize/Platform/iOS/Renderers/IconLabelRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,21 @@ protected override void OnElementPropertyChanged(Object sender, PropertyChangedE
/// </summary>
private void UpdateText()
{
var icon = Iconize.FindIconForKey(Element.Text);
if (!(icon is null))
var icons = Element.Text.Split("|");
var controlText = string.Empty;
foreach (var iconText in icons)
{
var font = Iconize.FindModuleOf(icon)?.ToUIFont((nfloat)Element.FontSize);
if (!(font is null))
var icon = Iconize.FindIconForKey(iconText);
if (!(icon is null))
{
Control.Text = $"{icon.Character}";
Control.Font = font;
var font = Iconize.FindModuleOf(icon)?.ToUIFont((nfloat)Element.FontSize);
if (!(font is null))
{
Control.Text += $"{controlText}";
Control.Font = font;
}
}
}
}
}
}
}