fixed FontAwesome5Pro Duotone issue

thudugala · Aug 21, 2019 · 27c4eb2 · 27c4eb2
1 parent e4ff682
commit 27c4eb2
Show file tree

Hide file tree

Showing 8 changed files with 2,098 additions and 2,083 deletions.
diff --git a/Source/Plugin.Glypher.FontAwesome5Free/Plugin.Glypher.FontAwesome5Free.csproj b/Source/Plugin.Glypher.FontAwesome5Free/Plugin.Glypher.FontAwesome5Free.csproj
@@ -38,6 +38,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
-    <PackageReference Include="Plugin.Glypher" Version="1.0.1" />
+    <PackageReference Include="Plugin.Glypher" Version="1.1.0" />
   </ItemGroup>
 </Project>
diff --git a/Source/Plugin.Glypher.FontAwesome5Pro/GlyphListBrands.cs b/Source/Plugin.Glypher.FontAwesome5Pro/GlyphListBrands.cs
diff --git a/Source/Plugin.Glypher.FontAwesome5Pro/GlyphListDuotone.cs b/Source/Plugin.Glypher.FontAwesome5Pro/GlyphListDuotone.cs
diff --git a/Source/Plugin.Glypher.FontAwesome5Pro/Plugin.Glypher.FontAwesome5Pro.csproj b/Source/Plugin.Glypher.FontAwesome5Pro/Plugin.Glypher.FontAwesome5Pro.csproj
@@ -20,7 +20,7 @@
     <Description>This plugin extend support for font glyphs (font icons) using FontAwesomePro in Xamarin.Forms applications.</Description>
     <PackageIconUrl>https://raw.githubusercontent.com/thudugala/Plugin.Glypher/master/screenshots/fontAwesomeIcon.png</PackageIconUrl>
     <Copyright>Copyright © Elvin (Tharindu) Thudugala</Copyright>
-    <Version>5.10.1.1</Version>
+    <Version>5.10.1.2</Version>
     <PackageReleaseNotes>Check: https://github.com/thudugala/Plugin.Glypher/releases </PackageReleaseNotes>
     <owners>ththlk</owners>
 
@@ -33,6 +33,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
-    <PackageReference Include="Plugin.Glypher" Version="1.0.1" />
+    <PackageReference Include="Plugin.Glypher" Version="1.1.0" />
   </ItemGroup>
 </Project>
diff --git a/Source/Plugin.Glypher.WeatherIcons/Plugin.Glypher.WeatherIcons.csproj b/Source/Plugin.Glypher.WeatherIcons/Plugin.Glypher.WeatherIcons.csproj
@@ -37,6 +37,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
-    <PackageReference Include="Plugin.Glypher" Version="1.0.1" />
+    <PackageReference Include="Plugin.Glypher" Version="1.1.0" />
   </ItemGroup>
 </Project>
diff --git a/sample/Direct/Sample.sln.DotSettings b/sample/Direct/Sample.sln.DotSettings
@@ -1,2 +1,3 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Duotone/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Glypher/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/sample/Direct/Sample/App.xaml.cs b/sample/Direct/Sample/App.xaml.cs
@@ -13,6 +13,7 @@ public App()
             //ChangeFontName();
 
             //GlyphRegister.Current.Init(typeof(Plugin.Glypher.FontAwesome5Pro.GlyphListBrands));
+            //GlyphRegister.Current.Init(typeof(Plugin.Glypher.FontAwesome5Pro.GlyphListDuotone));
             //GlyphRegister.Current.Init(typeof(Plugin.Glypher.FontAwesome5Pro.GlyphListLight));
             //GlyphRegister.Current.Init(typeof(Plugin.Glypher.FontAwesome5Pro.GlyphListRegular));
             //GlyphRegister.Current.Init(typeof(Plugin.Glypher.FontAwesome5Pro.GlyphListSolid));

diff --git a/sample/Direct/Sample/MainPage.xaml b/sample/Direct/Sample/MainPage.xaml
@@ -65,6 +65,19 @@
             TextColor="Purple"
             VerticalOptions="CenterAndExpand" />
 
+        <!--<Grid HorizontalOptions="Center" VerticalOptions="CenterAndExpand">
+            <Label
+                glypher:FontGlyph.Glyph="{x:Static fontAwesome5Pro:GlyphListDuotone.Fad_Crow_Primary}"
+                FontSize="48"
+                HorizontalTextAlignment="Center"
+                TextColor="CornflowerBlue" />
+            <Label
+                glypher:FontGlyph.Glyph="{x:Static fontAwesome5Pro:GlyphListDuotone.Fad_Crow_Secondary}"
+                FontSize="48"
+                HorizontalTextAlignment="Center"
+                TextColor="Goldenrod" />
+        </Grid>-->
+
         <Label
             x:Name="Label1"
             glypher:FontGlyph.Glyph="{x:Static fontAwesome5Free:GlyphListBrands.Fab_Bluetooth}"
@@ -91,7 +104,7 @@
         <Image HorizontalOptions="Center" VerticalOptions="CenterAndExpand">
             <Image.Source>
                 <FontImageSource
-                    glypher:FontGlyph.Glyph="{x:Static fontAwesome5Free:GlyphListRegular.Far_Bell_Slash}"
+                    glypher:FontGlyph.Glyph="{x:Static fontAwesome5Free:GlyphListRegular.Far_Address_Book}"
                     Size="48"
                     Color="Orange" />
             </Image.Source>