feat: Add .vscode/settings.json and update project files

- Added .vscode/settings.json file with dotnet.defaultSolution set to "AuroraControlsMaui.sln" - Updated AuroraControls.TestApp.csproj to conditionally set MtouchExtraArgs for iOS target platform - Updated AuroraControls.csproj to add package references for SkiaSharp.Views.Maui.Controls, Svg.Skia, Topten.RichTextKit, and SkiaSharp.HarfBuzz - Updated VisualElementExtensions.cs to improve code readability and remove unnecessary null checks
TheEightBot · Oct 18, 2023 · 44d728e · 44d728e
1 parent dcf79b4
commit 44d728e
Show file tree

Hide file tree

Showing 64 changed files with 247 additions and 227 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "dotnet.defaultSolution": "AuroraControlsMaui.sln"
+}
diff --git a/AuroraControls.TestApp/AuroraControls.TestApp.csproj b/AuroraControls.TestApp/AuroraControls.TestApp.csproj
@@ -18,9 +18,7 @@
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
-		<MtouchExtraArgs>--weak-framework=NewsstandKit.framework/NewsstandKit</MtouchExtraArgs>
+		<MtouchExtraArgs Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">--weak-framework=NewsstandKit.framework/NewsstandKit</MtouchExtraArgs>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
 		<CreatePackage>false</CreatePackage>

diff --git a/AuroraControlsMaui/AuroraControlBuilder.cs b/AuroraControlsMaui/AuroraControlBuilder.cs
@@ -40,4 +40,4 @@ public static MauiAppBuilder UseAuroraControls(this MauiAppBuilder mauiAppBuilde
 
         return mauiAppBuilder;
     }
-}
+}
diff --git a/AuroraControlsMaui/AuroraControls.csproj b/AuroraControlsMaui/AuroraControls.csproj
@@ -1,25 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
-		<UseMaui>true</UseMaui>
-		<SingleProject>true</SingleProject>
-		<ImplicitUsings>enable</ImplicitUsings>
-
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
-		<AssemblyName>AuroraControls</AssemblyName>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
-	  <CreatePackage>false</CreatePackage>
-	</PropertyGroup>
-
-	<ItemGroup>
-	  <PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.6" />
-	  <PackageReference Include="Svg.Skia" Version="1.0.0.2" />
-	  <PackageReference Include="Topten.RichTextKit" Version="0.4.166" />
-	  <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.6" />
-	</ItemGroup>
-</Project>
+    <PropertyGroup>
+        <TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+        <UseMaui>true</UseMaui>
+        <SingleProject>true</SingleProject>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
+        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+        <AssemblyName>AuroraControls</AssemblyName>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
+        <CreatePackage>false</CreatePackage>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="SkiaSharp.Views.Maui.Controls"
+                          Version="2.88.6" />
+        <PackageReference Include="Svg.Skia"
+                          Version="1.0.0.2" />
+        <PackageReference Include="Topten.RichTextKit"
+                          Version="0.4.166" />
+        <PackageReference Include="SkiaSharp.HarfBuzz"
+                          Version="2.88.6" />
+    </ItemGroup>
+</Project>
diff --git a/AuroraControlsMaui/AuroraViewBase.cs b/AuroraControlsMaui/AuroraViewBase.cs
@@ -125,4 +125,4 @@ private void PaintSurfaceInternal(SKSurface surface, SKImageInfo info)
             }
         }
     }
-}
+}
diff --git a/AuroraControlsMaui/AuroraViewHandler.cs b/AuroraControlsMaui/AuroraViewHandler.cs
@@ -9,4 +9,4 @@ public AuroraViewHandler()
          : base(SKCanvasViewHandler.SKCanvasViewMapper, SKCanvasViewHandler.SKCanvasViewCommandMapper)
     {
     }
-}
+}
diff --git a/AuroraControlsMaui/CupertinoToggleSwitch.cs b/AuroraControlsMaui/CupertinoToggleSwitch.cs
@@ -336,4 +336,4 @@ private void AnimateToggle(bool toggled)
             easing: Easing.CubicInOut,
             length: ToggleAnimationDuration);
     }
-}
+}
diff --git a/AuroraControlsMaui/Easings.cs b/AuroraControlsMaui/Easings.cs
@@ -420,4 +420,4 @@ public static double BounceEaseInOut(double p)
 
         return (0.5d * BounceEaseOut((p * 2) - 1)) + 0.5d;
     }
-}
+}
diff --git a/AuroraControlsMaui/EmbeddedResourceLoader.cs b/AuroraControlsMaui/EmbeddedResourceLoader.cs
@@ -54,4 +54,4 @@ public static Stream Load(string name)
 
         return stream ?? Stream.Null;
     }
-}
+}
diff --git a/AuroraControlsMaui/EndCapType.cs b/AuroraControlsMaui/EndCapType.cs
@@ -6,4 +6,4 @@ public enum EndCapType
 {
     Square = 1,
     Rounded = 2,
-}
+}
diff --git a/AuroraControlsMaui/Extensions/ColorExtensions.cs b/AuroraControlsMaui/Extensions/ColorExtensions.cs
@@ -38,4 +38,4 @@ public static SKColor WithAlpha(this SKColor color, float alpha)
 
         return color.WithAlpha((byte)alphaByte);
     }
-}
+}
diff --git a/AuroraControlsMaui/Extensions/DrawingExtensions.cs b/AuroraControlsMaui/Extensions/DrawingExtensions.cs
@@ -19,4 +19,4 @@ public static System.Drawing.PointF Center(this RectangleF rectangle)
                 rectangle.Left + (rectangle.Width / 2f),
                 rectangle.Top + (rectangle.Height / 2f));
     }
-}
+}
diff --git a/AuroraControlsMaui/Extensions/ImageSourceExtensions.cs b/AuroraControlsMaui/Extensions/ImageSourceExtensions.cs
@@ -294,4 +294,4 @@ public static UriImageSource AsAsyncUriImageSource(this Task<UriImageSource> ima
             .FileImageSourceFromSvg(svgName, squareSize, colorOverride: colorOverride)
             .AsAsyncSourceFor(image);
     }
-}
+}
diff --git a/AuroraControlsMaui/Extensions/MathExtensions.cs b/AuroraControlsMaui/Extensions/MathExtensions.cs
@@ -40,4 +40,4 @@ public static byte Lerp(this byte start, byte end, double amount)
 
         return (byte)(start + adjusted);
     }
-}
+}
diff --git a/AuroraControlsMaui/Extensions/ObjectExtensions.cs b/AuroraControlsMaui/Extensions/ObjectExtensions.cs
@@ -40,4 +40,4 @@ public static T Clamp<T>(this T val, T min, T max)
 
         return val;
     }
-}
+}
diff --git a/AuroraControlsMaui/Extensions/SKCanvasExtensions.cs b/AuroraControlsMaui/Extensions/SKCanvasExtensions.cs
@@ -449,4 +449,4 @@ public static Size IconifiedTextSize(this SKCanvas canvas, string text, SKPaint
 
         return new Size(width, height);
     }
-}
+}
diff --git a/AuroraControlsMaui/Extensions/SKTextRun.cs b/AuroraControlsMaui/Extensions/SKTextRun.cs
@@ -112,4 +112,4 @@ public static IEnumerable<SKTextRun> Create(string text, SKTextRunLookup lookup,
 
         return runs;
     }
-}
+}
diff --git a/AuroraControlsMaui/Extensions/SKTextRunLookup.cs b/AuroraControlsMaui/Extensions/SKTextRunLookup.cs
@@ -97,4 +97,4 @@ public void Dispose()
     {
         Dispose(true);
     }
-}
+}
diff --git a/AuroraControlsMaui/Extensions/SKTextRunLookupEntry.cs b/AuroraControlsMaui/Extensions/SKTextRunLookupEntry.cs
@@ -76,4 +76,4 @@ public void Dispose()
     {
         Dispose(true);
     }
-}
+}
diff --git a/AuroraControlsMaui/Extensions/SkiaShapeExtensions.cs b/AuroraControlsMaui/Extensions/SkiaShapeExtensions.cs
@@ -59,4 +59,4 @@ public static SKRectI Subtract(this SKRectI rect, Thickness thickness)
 
         return rect;
     }
-}
+}
diff --git a/AuroraControlsMaui/Extensions/SkiaSharpTextExtensions.cs b/AuroraControlsMaui/Extensions/SkiaSharpTextExtensions.cs
@@ -108,10 +108,7 @@ public static void DrawTextAtBaseline(
 
     public static void EnsureHasValidFont(this SKPaint fontPaint, string text)
     {
-        if (fontPaint.Typeface is null)
-        {
-            fontPaint.Typeface = PlatformInfo.DefaultTypeface;
-        }
+        fontPaint.Typeface ??= PlatformInfo.DefaultTypeface;
 
         // TODO: There is likely a better/faster way to do all of this
         if (!string.IsNullOrEmpty(text) && !fontPaint.Typeface.ContainsGlyphs(text))
@@ -136,4 +133,4 @@ public static void EnsureHasValidFont(this SKPaint fontPaint, string text)
             }
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
             return mauiAppBuilder;
         }
-    }
+    }