Prepare release 1.3 (#167)

* Change version to 1.3 * Update Readme * Add initializers * Update Readme * Fix TextMask pixel scaling * Update Readme
mgierlasinski · Apr 26, 2021 · 39efb6c · 39efb6c
1 parent ae4b06c
commit 39efb6c
Show file tree

Hide file tree

Showing 16 changed files with 241 additions and 59 deletions.
diff --git a/Assets/Images/clip_mode_exclude.png b/Assets/Images/clip_mode_exclude.png
diff --git a/Assets/Images/clip_mode_include.png b/Assets/Images/clip_mode_include.png
diff --git a/Assets/Images/mask_collection.png b/Assets/Images/mask_collection.png
diff --git a/Assets/Images/mask_ellipse.png b/Assets/Images/mask_ellipse.png
diff --git a/Assets/Images/mask_path.png b/Assets/Images/mask_path.png
diff --git a/Assets/Images/mask_rectangle.png b/Assets/Images/mask_rectangle.png
diff --git a/Assets/Images/mask_text.png b/Assets/Images/mask_text.png
diff --git a/Assets/Images/masks.png b/Assets/Images/masks.png
diff --git a/MagicGradients.Toolkit/Initializer.cs b/MagicGradients.Toolkit/Initializer.cs
@@ -0,0 +1,10 @@
+namespace MagicGradients.Toolkit
+{
+    public static class Initializer
+    {
+        public static void Init()
+        {
+
+        }
+    }
+}
diff --git a/MagicGradients/MagicGradients.csproj b/MagicGradients/MagicGradients.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
 	<LangVersion>8.0</LangVersion>
-    <Version>1.2.0</Version>
+    <Version>1.3.0</Version>
     <Authors>Marcin Gierlasiński, Bohdan Benetskyi and Contributors</Authors>
     <Product>Magic Gradients</Product>
     <Description>Draw breathtaking backgrounds in your Xamarin.Forms application. It's a kind of magic. Powered by SkiaSharp.</Description>

diff --git a/MagicGradients/Masks/TextMask.cs b/MagicGradients/Masks/TextMask.cs
@@ -50,13 +50,13 @@ public override void Clip(RenderContext context)
             if (!IsActive)
                 return;
 
-            using var textPaint = GetTextPaint();
+            using var textPaint = GetTextPaint(context);
             using var textPath = textPaint.GetTextPath(Text, 0, 0);
 
             ClipPath(context, textPath);
         }
 
-        private SKPaint GetTextPaint()
+        private SKPaint GetTextPaint(RenderContext context)
         {
             var isBold = (FontAttributes & FontAttributes.Bold) == FontAttributes.Bold;
             var isItalic = (FontAttributes & FontAttributes.Italic) == FontAttributes.Italic;
@@ -68,7 +68,7 @@ private SKPaint GetTextPaint()
 
             return new SKPaint
             {
-                TextSize = (float)FontSize,
+                TextSize = (float)(FontSize * context.PixelScaling),
                 Typeface = SKTypeface.FromFamilyName(FontFamily, fontStyle),
                 IsAntialias = true
             };

diff --git a/Playground/Playground/App.xaml.cs b/Playground/Playground/App.xaml.cs
@@ -6,21 +6,15 @@ public partial class App : Application
     {
         public App()
         {
-            Device.SetFlags(new[]
-            {
-                "Shapes_Experimental", 
-                "Expander_Experimental", 
-                "Shell_UWP_Experimental"
-            });
+            Device.SetFlags(new[] { "Shell_UWP_Experimental" });
 
             InitializeComponent();
 
+            MagicGradients.Toolkit.Initializer.Init();
             Sharpnado.Shades.Initializer.Initialize(false);
             Sharpnado.Tabs.Initializer.Initialize(false, false);
 
-            AppSetup.RegisterTypes();
-            AppSetup.RegisterViewModels();
-            AppSetup.Initialize();
+            AppSetup.ConfigureAndRun();
 
             MainPage = new AppShell();
         }

diff --git a/Playground/Playground/AppSetup.cs b/Playground/Playground/AppSetup.cs
@@ -20,6 +20,14 @@ public static class AppSetup
     {
         public static Container IoC { get; } = new Container();
 
+        public static void ConfigureAndRun()
+        {
+            RegisterTypes();
+            RegisterViewModels();
+            RegisterRoutes();
+            Initialize();
+        }
+
         public static void RegisterTypes()
         {
             IoC.Register<IDatabaseProvider, DatabaseProvider>();

diff --git a/Playground/Playground/AppShell.xaml.cs b/Playground/Playground/AppShell.xaml.cs
@@ -7,8 +7,6 @@ public partial class AppShell : Shell
         public AppShell()
         {
             InitializeComponent();
-
-            AppSetup.RegisterRoutes();
         }
     }
 }
diff --git a/Playground/Playground/Features/Masks/MasksPage.xaml b/Playground/Playground/Features/Masks/MasksPage.xaml
@@ -34,7 +34,7 @@
                     <magic:GradientView StyleClass="textExclude" HorizontalOptions="Fill" Grid.Column="1">
                         <magic:GradientView.Mask>
                             <magic:MaskCollection>
-                                <magic:TextMask Text="Gradients" FontSize="50" ClipMode="Exclude" />
+                                <magic:TextMask Text="Gradients" FontSize="30" ClipMode="Exclude" />
                                 <magic:RectangleMask Corners="0,0,50,0" />
                             </magic:MaskCollection>
                         </magic:GradientView.Mask>