Merge pull request #97 from AathifMahir/vNext

vNext of MauiIcons
AathifMahir · May 6, 2024 · bf82f30 · bf82f30
2 parents 9a701ce + 06cb120
commit bf82f30
Show file tree

Hide file tree

Showing 33 changed files with 614 additions and 112 deletions.
diff --git a/README.md b/README.md
@@ -128,6 +128,42 @@ new MauiIcon().Icon(MaterialIcons.ABC).IconColor(Colors.Violet);
 <Image Aspect="Center" Source="{mi:Cupertino Icon=ArchiveboxFill}"/>
 
 <Label Text="{mi:Fluent Icon=Accounts}"/>
+
+<ImageButton Source="{mi:Material Icon=AccessAlarm}"/>
+
+<Entry Placeholder="{mi:FontAwesome Icon=AddressBook}"/>
+
+<Button Text="{mi:SegoeFluent AdjustHologram, IconSize=Large, IconColor=Pink}" />
+```
+
+## Xaml Extension Data Binding Usage
+
+The below example, Make Sures that BindingContext Inside the Xaml Extension is Set to Root of this Page, Likewise make sure to set the BindingContext When using Binding Inside the MauiIcons Xaml Extension, Additionally This example Binds to MyIcon and MyColor Properties Which Present in Code Behind But Not Included in this Example.
+```xml
+<ContentPage
+    x:Class="MauiIcons.Sample.BindingPage"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:MauiIcons.Sample"
+    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+    x:Name="thisRoot">
+        <HorizontalStackLayout>
+            <Label Text="{mi:Fluent BindingContext={x:Reference thisRoot}, Icon={Binding MyIcon}, IconColor={Binding MyColor}}" />
+            <Image>
+                <Image.Source>
+                    <FontImageSource 
+                    Glyph="{mi:Fluent BindingContext={x:Reference thisRoot}, 
+                    Icon={Binding MyIcon}, IconColor={Binding MyColor}}" />
+                </Image.Source>
+            </Image>
+
+            <Image Source="{mi:Fluent BindingContext={x:Reference thisRoot}, Icon={Binding MyIcon}, IconColor={Binding MyColor}}" />
+
+            <ImageButton Source="{mi:Fluent BindingContext={x:Reference thisRoot}, Icon={Binding MyIcon}, IconColor={Binding MyColor}" />
+
+            <mi:MauiIcon Icon="{mi:Fluent}" />
+        </HorizontalStackLayout>
+</ContentPage>
 ```
 
 ## C# Markup Usage

diff --git a/samples/MauiIcons.Sample/AppShell.xaml b/samples/MauiIcons.Sample/AppShell.xaml
@@ -9,15 +9,20 @@
 
     <TabBar>
         <ShellContent
-     Title="Xaml"
-     ContentTemplate="{DataTemplate local:MainPage}"
-     Route="MainPage" Icon="{mi:Fluent Icon=Home12}">
-        </ShellContent>
+            Title="Xaml"
+            ContentTemplate="{DataTemplate local:MainPage}"
+            Icon="{mi:Fluent Icon=Home12}"
+            Route="MainPage" />
+        <ShellContent
+            Title="Code"
+            ContentTemplate="{DataTemplate local:BindingPage}"
+            Icon="{mi:FluentFilled Icon=BuildingHome24Filled}"
+            Route="MainPage" />
         <ShellContent
             Title="Markup"
             ContentTemplate="{DataTemplate local:MarkupPage}"
-            Route="MainPage" Icon="{mi:FluentFilled Icon=Home12Filled}">
-        </ShellContent>
+            Icon="{mi:FluentFilled Icon=Home12Filled}"
+            Route="MainPage" />
     </TabBar>
 
 

diff --git a/samples/MauiIcons.Sample/BindingPage.xaml b/samples/MauiIcons.Sample/BindingPage.xaml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage
+    x:Class="MauiIcons.Sample.BindingPage"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:MauiIcons.Sample"
+    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+    x:Name="thisRoot"
+    Title="BindingPage"
+    x:DataType="local:BindingPage">
+    <ScrollView>
+        <VerticalStackLayout
+            Padding="30,0"
+            Spacing="25"
+            VerticalOptions="Center">
+
+            <HorizontalStackLayout HorizontalOptions="Center" Spacing="20">
+
+                <Label Text="{mi:Fluent BindingContext={x:Reference thisRoot}, Icon={Binding MyIcon}, IconColor={Binding MyColor}}" />
+                <Image>
+                    <Image.Source>
+                        <FontImageSource Glyph="{mi:Fluent BindingContext={x:Reference thisRoot}, Icon={Binding MyIcon}, IconColor={Binding MyColor}}" />
+                    </Image.Source>
+                </Image>
+
+                <Image Source="{mi:Fluent BindingContext={x:Reference thisRoot}, Icon={Binding MyIcon}, IconColor={Binding MyColor}}" />
+
+                <ImageButton Source="{mi:Fluent BindingContext={x:Reference thisRoot}, Icon={Binding MyIcon}, IconColor={Binding MyColor}}" />
+
+                <mi:MauiIcon Icon="{mi:Fluent}" />
+            </HorizontalStackLayout>
+
+            <Button Clicked="Button_Clicked" Text="Change Icon and Color" />
+
+        </VerticalStackLayout>
+    </ScrollView>
+</ContentPage>
diff --git a/samples/MauiIcons.Sample/BindingPage.xaml.cs b/samples/MauiIcons.Sample/BindingPage.xaml.cs
@@ -0,0 +1,47 @@
+using MauiIcons.Fluent;
+
+namespace MauiIcons.Sample;
+
+public partial class BindingPage : ContentPage
+{
+	public BindingPage()
+	{
+		InitializeComponent();
+		BindingContext = this;
+	}
+
+    private Color _color = Colors.Red;
+    public Color MyColor
+    {
+        get => _color;
+        set
+        {
+            if (value != _color)
+            {
+                _color = value;
+                OnPropertyChanged();
+            }
+        }
+    }
+
+    private FluentIcons _icon = FluentIcons.Accessibility16;
+
+    public FluentIcons MyIcon
+    {
+        get => _icon;
+        set
+        {
+            if (value != _icon)
+            {
+                _icon = value;
+                OnPropertyChanged();
+            }
+        }
+    }
+
+    private void Button_Clicked(object sender, EventArgs e)
+    {
+        MyColor = MyColor == Colors.Red ? Colors.Green : Colors.Red;
+        MyIcon = MyIcon == FluentIcons.Accessibility16 ? FluentIcons.AddCircle24 : FluentIcons.Accessibility16;
+    }
+}
diff --git a/samples/MauiIcons.Sample/MauiIcons.Sample.csproj b/samples/MauiIcons.Sample/MauiIcons.Sample.csproj
@@ -73,4 +73,10 @@
 		<PackageReference Include="CommunityToolkit.Maui.Markup" Version="3.3.0" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <MauiXaml Update="BindingPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	</ItemGroup>
+
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -29,9 +29,9 @@
 	<PropertyGroup Condition="'$(MSBuildProjectName)' != 'MauiIcons.Sample' and $(MSBuildProjectName) != 'MauiIcons.Modules.UnitTest'">
 		<Title>MauiIcons</Title>
 		<PackageIcon>icon.png</PackageIcon>
-		<AssemblyVersion>2.1.5.0</AssemblyVersion>
-		<AssemblyFileVersion>2.1.5.0</AssemblyFileVersion>
-		<Version>2.1.5</Version>
+		<AssemblyVersion>2.2.5.0</AssemblyVersion>
+		<AssemblyFileVersion>2.2.5.0</AssemblyFileVersion>
+		<Version>2.2.5</Version>
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
 		<PackageVersion>$(Version)$(VersionSuffix)</PackageVersion>
 		<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>

diff --git a/src/MauiIcons.Core/Converters/DefaultColorConverter.cs b/src/MauiIcons.Core/Converters/DefaultColorConverter.cs
@@ -0,0 +1,18 @@
+using System.Globalization;
+
+namespace MauiIcons.Core.Converters;
+internal sealed class DefaultColorConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) =>
+        value switch
+        {
+            null when parameter is Color color => color,
+            Color colorValue => colorValue,
+            _ => null
+        };
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}