Use TenMica on Win 10

Guerra24 · Sep 27, 2023 · 8d8fbcb · 8d8fbcb
1 parent 0024f47
commit 8d8fbcb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 20 deletions.
diff --git a/LRReader.Shared/LRReader.Shared.csproj b/LRReader.Shared/LRReader.Shared.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NReco.Logging.File" Version="1.1.6" />
+    <PackageReference Include="NReco.Logging.File" Version="1.1.7" />
     <PackageReference Include="Nullable" Version="1.3.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/LRReader.UWP/LRReader.UWP.csproj b/LRReader.UWP/LRReader.UWP.csproj
@@ -456,6 +456,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="TenMica">
+      <Version>1.0.0-beta</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LRReader.Shared\LRReader.Shared.csproj">

diff --git a/LRReader.UWP/Views/Root.xaml b/LRReader.UWP/Views/Root.xaml
@@ -5,17 +5,8 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="using:LRReader.UWP.Views"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-	xmlns:muxm="using:Microsoft.UI.Xaml.Media"
-	muxc:BackdropMaterial.ApplyToRootOrPageBackground="True"
 	ActualThemeChanged="{x:Bind UpdateThemeColors}"
 	mc:Ignorable="d">
-	<Page.Resources>
-		<muxm:AcrylicBrush
-			x:Key="MicaFallbackBrush" BackgroundSource="HostBackdrop"
-			FallbackColor="{ThemeResource SolidBackgroundFillColorBase}"
-			TintColor="{ThemeResource MicaFallback}" />
-	</Page.Resources>
 
 	<Frame x:Name="FrameContent" x:FieldModifier="public" IsNavigationStackEnabled="False" />
 </Page>
diff --git a/LRReader.UWP/Views/Root.xaml.cs b/LRReader.UWP/Views/Root.xaml.cs
@@ -1,5 +1,6 @@
 using LRReader.Shared.Services;
-using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Controls;
+using TenMica;
 using Windows.Foundation.Metadata;
 using Windows.UI;
 using Windows.UI.ViewManagement;
@@ -15,7 +16,11 @@ public Root()
 			this.InitializeComponent();
 			if (!ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 13))
 			{
-				Background = (AcrylicBrush)Resources["MicaFallbackBrush"];
+				Background = new TenMicaBrush();
+			}
+			else
+			{
+				BackdropMaterial.SetApplyToRootOrPageBackground(this, true);
 			}
 		}
 

diff --git a/nuget.config b/nuget.config