Fix page overlay not showing up in deduplicator

Guerra24 · May 1, 2022 · 55e8226 · 55e8226
1 parent 6f22b5b
commit 55e8226
Show file tree

Hide file tree

Showing 10 changed files with 141 additions and 128 deletions.
diff --git a/LRReader.Avalonia/LRReader.Avalonia.csproj b/LRReader.Avalonia/LRReader.Avalonia.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="Avalonia" Version="0.10.13" />
     <PackageReference Include="Avalonia.Desktop" Version="0.10.13" />
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.13" />
-    <PackageReference Include="FluentAvaloniaUI" Version="1.3.2" />
+    <PackageReference Include="FluentAvaloniaUI" Version="1.3.4" />
     <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
   </ItemGroup>
   <ItemGroup>

diff --git a/LRReader.Avalonia/Resources/AvaloniaTemplates.axaml b/LRReader.Avalonia/Resources/AvaloniaTemplates.axaml
diff --git a/LRReader.Avalonia/Views/Controls/CustomTab.cs b/LRReader.Avalonia/Views/Controls/CustomTab.cs
@@ -1,14 +1,21 @@
 using Aura.UI.Controls;
 using Avalonia;
 using Avalonia.Styling;
+using FluentAvalonia.UI.Controls;
 using LRReader.Shared.Models;
 using System;
 
 namespace LRReader.Avalonia
 {
 	public class CustomTab : AuraTabItem, ICustomTab, IStyleable
 	{
-		Type IStyleable.StyleKey => typeof(AuraTabItem);
+		Type IStyleable.StyleKey => typeof(CustomTab);
+
+		public Symbol CustomTabIcon
+		{
+			get => (Symbol)GetValue(CustomTabIconProperty)!;
+			set => SetValue(CustomTabIconProperty, value);
+		}
 
 		public object CustomTabControl
 		{
@@ -22,6 +29,12 @@ public string CustomTabId
 			set => SetValue(CustomTabIdProperty, value);
 		}
 
+		public bool CustomTabIsClosable
+		{
+			get => (bool)GetValue(CustomTabIsClosableProperty);
+			set => SetValue(CustomTabIsClosableProperty, value);
+		}
+
 		public virtual void Unload()
 		{
 		}
@@ -33,5 +46,7 @@ public virtual bool BackRequested()
 
 		public static readonly AvaloniaProperty<object> CustomTabControlProperty = AvaloniaProperty.Register<CustomTab, object>("CustomTabControl");
 		public static readonly AvaloniaProperty<string> CustomTabIdProperty = AvaloniaProperty.Register<CustomTab, string>("CustomTabId");
+		public static readonly AvaloniaProperty<Symbol> CustomTabIconProperty = AvaloniaProperty.Register<CustomTab, Symbol>("CustomTabIcon");
+		public static readonly AvaloniaProperty<bool> CustomTabIsClosableProperty = AvaloniaProperty.Register<CustomTab, bool>("CustomTabIsClosable", true);
 	}
 }
diff --git a/LRReader.Avalonia/Views/Tabs/ArchivesTab.axaml b/LRReader.Avalonia/Views/Tabs/ArchivesTab.axaml
@@ -11,6 +11,8 @@
 				x:Class="LRReader.Avalonia.Views.Tabs.ArchivesTab"
 				Header="{loc:LocalizedString Key=/Tabs/Archives/Tab/Header}"
 				CustomTabId="Archives"
+                CustomTabIcon="Library"
+                CustomTabIsClosable="False"
 				Height="34">
 	<content:Archives />
 </tabs:CustomTab>
diff --git a/LRReader.Avalonia/Views/Tabs/Content/Archives.axaml b/LRReader.Avalonia/Views/Tabs/Content/Archives.axaml
@@ -13,7 +13,6 @@
 			 x:CompileBindings="True"
 			 x:DataType="vm:ArchivesPageViewModel"
 			 x:Class="LRReader.Avalonia.Views.Tabs.Content.Archives"
-             Background="{DynamicResource SolidBackgroundFillColorBase}"
 			 DataContext="{ReflectionBinding ArchivesPageInstance, Source={StaticResource Locator}}"
 			 AttachedToVisualTree="Archives_AttachedToVisualTree">
 

diff --git a/LRReader.Avalonia/Views/Tabs/SettingsTab.axaml b/LRReader.Avalonia/Views/Tabs/SettingsTab.axaml
@@ -8,6 +8,7 @@
                 mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
                 x:Class="LRReader.Avalonia.Views.Tabs.SettingsTab"
                 CustomTabId="Settings"
+                CustomTabIcon="Settings"
                 Header="{loc:LocalizedString Key=/Tabs/Settings/Tab/Header}">
 
 </tabs:CustomTab>
diff --git a/LRReader.Shared/LRReader.Shared.csproj b/LRReader.Shared/LRReader.Shared.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.5.0" Condition="'$(TargetFramework)' == 'uap10.0.17763'" />
+    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.5.1" Condition="'$(TargetFramework)' == 'uap10.0.17763'" />
     <PackageReference Include="Caching.dll" Version="2.0.0.1" />
     <PackageReference Include="KeyedSemaphores" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
@@ -24,7 +24,7 @@
     <PackageReference Include="RestSharp" Version="107.3.0" />
     <PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="107.3.0" />
     <PackageReference Include="SharpZipLib" Version="1.3.3" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.0" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.1" />
     <PackageReference Include="System.Reactive" Version="5.0.0" />
   </ItemGroup>
 

diff --git a/LRReader.Shared/ViewModels/LoadingPageViewModel.cs b/LRReader.Shared/ViewModels/LoadingPageViewModel.cs
@@ -103,7 +103,7 @@ private async Task Connect()
 			StatusSub = "";
 			Retry = false;
 			Active = true;
-			if (!Api.RefreshSettings(Settings.Profile))
+			if (!Api.RefreshSettings(Settings.Profile!))
 			{
 				Status = Platform.GetLocalizedString("Pages/LoadingPage/InvalidAddress");
 				StatusSub = Platform.GetLocalizedString("Pages/LoadingPage/InvalidAddressSub");
@@ -113,7 +113,7 @@ private async Task Connect()
 			var serverInfo = await ServerProvider.GetServerInfo();
 			if (serverInfo == null)
 			{
-				var address = Settings.Profile.ServerAddress;
+				var address = Settings.Profile!.ServerAddress;
 				if (address.Contains("127.0.0.") || address.Contains("localhost"))
 				{
 					Status = Platform.GetLocalizedString("Pages/LoadingPage/NoConnectionLocalHost");

diff --git a/LRReader.UWP/LRReader.UWP.csproj b/LRReader.UWP/LRReader.UWP.csproj
@@ -401,7 +401,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AppCenter.Crashes">
-      <Version>4.5.0</Version>
+      <Version>4.5.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging">
       <Version>6.0.0</Version>
@@ -428,10 +428,10 @@
       <Version>7.1.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.8.0-prerelease.220118001</Version>
+      <Version>2.8.0-prerelease.220413001</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Web.WebView2">
-      <Version>1.0.1150.38</Version>
+      <Version>1.0.1185.39</Version>
     </PackageReference>
     <PackageReference Include="NReco.Logging.File">
       <Version>1.1.4</Version>

diff --git a/LRReader.UWP/Views/Items/ArchiveImage.cs b/LRReader.UWP/Views/Items/ArchiveImage.cs
@@ -56,7 +56,8 @@ protected override void OnApplyTemplate()
 		{
 			base.OnApplyTemplate();
 			Root = GetTemplateChild("Root") as Grid;
-			VisualStateManager.GoToState(this, "Hidden", false);
+			if (!KeepOverlayOpen)
+				VisualStateManager.GoToState(this, "Hidden", false);
 		}
 
 		private async void UserControl_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs args)