Avalonia: re template some controls and fix visual issues

Guerra24 · Apr 4, 2022 · 6f22b5b · 6f22b5b
1 parent 9def441
commit 6f22b5b
Show file tree

Hide file tree

Showing 8 changed files with 340 additions and 19 deletions.
diff --git a/LRReader.Avalonia.Desktop/LRReader.Avalonia.Desktop.csproj b/LRReader.Avalonia.Desktop/LRReader.Avalonia.Desktop.csproj
@@ -5,6 +5,7 @@
     <Nullable>enable</Nullable>
     <ApplicationIcon>logo.ico</ApplicationIcon>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    <TrimMode>copyused</TrimMode>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="logo.ico" />

diff --git a/LRReader.Avalonia.Desktop/Properties/PublishProfiles/linux-x64.pubxml b/LRReader.Avalonia.Desktop/Properties/PublishProfiles/linux-x64.pubxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
+https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
@@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
-    <PublishSingleFile>True</PublishSingleFile>
-    <PublishTrimmed>False</PublishTrimmed>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishTrimmed>true</PublishTrimmed>
   </PropertyGroup>
 </Project>
diff --git a/LRReader.Avalonia.Desktop/Properties/PublishProfiles/macos-x64.pubxml b/LRReader.Avalonia.Desktop/Properties/PublishProfiles/macos-x64.pubxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
+https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
@@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
-    <PublishSingleFile>True</PublishSingleFile>
-    <PublishTrimmed>False</PublishTrimmed>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishTrimmed>true</PublishTrimmed>
   </PropertyGroup>
 </Project>
diff --git a/LRReader.Avalonia.Desktop/Properties/PublishProfiles/win-x64.pubxml b/LRReader.Avalonia.Desktop/Properties/PublishProfiles/win-x64.pubxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
+https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
@@ -11,8 +11,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
-    <PublishSingleFile>True</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
-    <PublishTrimmed>False</PublishTrimmed>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>false</PublishReadyToRun>
+    <PublishTrimmed>true</PublishTrimmed>
   </PropertyGroup>
 </Project>
diff --git a/LRReader.Avalonia/LRReader.Avalonia.csproj b/LRReader.Avalonia/LRReader.Avalonia.csproj
@@ -8,7 +8,7 @@
     <PackageReference Include="Aura.UI.FluentTheme" Version="0.1.4.2" />
     <PackageReference Include="Avalonia" Version="0.10.13" />
     <PackageReference Include="Avalonia.Desktop" Version="0.10.13" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.13" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.13" />
     <PackageReference Include="FluentAvaloniaUI" Version="1.3.2" />
     <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
   </ItemGroup>

diff --git a/LRReader.Avalonia/Resources/AvaloniaTemplates.axaml b/LRReader.Avalonia/Resources/AvaloniaTemplates.axaml
diff --git a/LRReader.Avalonia/Resources/ThemeDictionary.axaml b/LRReader.Avalonia/Resources/ThemeDictionary.axaml
@@ -1,5 +1,5 @@
 <Style xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Style.Resources>
 
   </Style.Resources>

diff --git a/LRReader.Avalonia/Views/Main/HostTabPage.axaml b/LRReader.Avalonia/Views/Main/HostTabPage.axaml
@@ -37,13 +37,14 @@
               <Setter Property="Width" Value="34"/>
               <Setter Property="Height" Value="32" />
               <Setter Property="Padding" Value="0" />
+              <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
             </Style>
             <Style Selector="Viewbox">
               <Setter Property="MaxWidth" Value="18" />
               <Setter Property="MaxHeight" Value="18" />
             </Style>
           </Grid.Styles>
-          <StackPanel Orientation="Horizontal">
+          <StackPanel Orientation="Horizontal" Spacing="2">
             <Button ToolTip.Tip="{loc:LocalizedString Key=/Pages/HostTabPage/Bookmarks/ToolTipService/ToolTip}" Click="Bookmarks_Click">
               <Viewbox>
                 <ui:FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE728;" />
@@ -71,8 +72,8 @@
               Grid.Column="2"
               Width="1"
               Margin="3,8,3,8"
-              Background="{DynamicResource TextControlForeground}" />
-          <StackPanel Grid.Column="3"
+              Background="{DynamicResource DividerStrokeColorDefaultBrush}" />
+          <StackPanel Grid.Column="3" Spacing="2"
                       Orientation="Horizontal">
             <Button x:Name="EnterFullScreen" ToolTip.Tip="{loc:LocalizedString Key=/Pages/HostTabPage/EnterFullScreen/ToolTipService/ToolTip}" Click="EnterFullScreen_Click" IsVisible="{Binding Windowed, Mode=OneWay}">
               <Viewbox>