Merge pull request #18 from kuiperzone/dev/andyt/work

Dev/andyt/work
kuiperzone · Mar 27, 2023 · 7c9e243 · 7c9e243
2 parents 09b5e64 + 18ae883
commit 7c9e243
Show file tree

Hide file tree

Showing 32 changed files with 1,575 additions and 162 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 ###############################################################################
 
 TODO
+/INTERNAL
 
 ###############################################################################
 # Hidden
@@ -41,13 +42,9 @@ desktop.ini
 **/*-[Rr][Ee][Ll][Ee][Aa][Ss][Ee]*/
 **/[Pp][Rr][Oo][Ff][Ii][Ll][Ee]*/
 
-# Build, Deploy, Internal
+# Build, AppDir
 **/[Bb][Ll][Dd]/
 **/[Bb][Uu][Ii][Ll][Dd]*/
-**/[Dd][Ee][Pp][Ll][Oo][Yy]*/
-**/[Ii][Nn][Tt][Ee][Rr][Nn][Aa][Ll]*/
-
-# AppDir
 **/[Aa][Pp][Pp][Dd][Ii][Rr]*/
 
 # Temp

diff --git a/AvantGarde.Test/AvantGarde.Test.csproj b/AvantGarde.Test/AvantGarde.Test.csproj
@@ -7,7 +7,7 @@
 		<IsPublishable>false</IsPublishable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
 		<PackageReference Include="xunit" Version="2.4.2" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/AvantGarde.pupnet.conf b/AvantGarde.pupnet.conf
@@ -0,0 +1,69 @@
+# PUPNET DEPLOY 1.0.1
+
+# APP PREAMBLE
+AppBaseName = AvantGarde
+AppFriendlyName = Avant Garde
+AppId = zone.kuiper.AvantGarde
+AppVersionRelease = 1.1.0[1]
+AppShortSummary = A cross-platform XAML Previewer for the Avalonia .NET Framework
+AppLicenseId = GPL-3.0-or-later
+AppLicenseFile = LICENSE
+
+# PUBLISHER
+PublisherName = Kuiper Zone
+PublisherCopyright = Copyright (C) Andy Thomas 2022-23
+PublisherLinkName = Project Page
+PublisherLinkUrl = https://github.com/kuiperzone/AvantGarde
+PublisherEmail = contact@kuiper.zone
+
+# DESKTOP INTEGRATION
+DesktopNoDisplay = false
+DesktopTerminal = false
+DesktopFile = Deploy/AvantGarde.desktop
+StartCommand =
+PrimeCategory = Development
+MetaFile =  Deploy/AvantGarde.metainfo.xml
+IconFiles = """
+    Deploy/AvantGarde.ico
+    Deploy/AvantGarde.svg
+    Deploy/AvantGarde.16x16.png
+    Deploy/AvantGarde.24x24.png
+    Deploy/AvantGarde.32x32.png
+    Deploy/AvantGarde.48x48.png
+    Deploy/AvantGarde.64x64.png
+    Deploy/AvantGarde.96x96.png
+    Deploy/AvantGarde.128x128.png
+    Deploy/AvantGarde.256x256.png
+"""
+
+# DOTNET PUBLISH
+DotnetProjectPath =
+DotnetPublishArgs = -p:Version=${APP_VERSION} --self-contained true -p:DebugType=None -p:DebugSymbols=false
+DotnetPostPublish =
+DotnetPostPublishOnWindows =
+
+# PACKAGE OUTPUT
+PackageName = AvantGarde
+OutputDirectory = Deploy/OUT
+
+# APPIMAGE OPTIONS
+AppImageArgs =
+AppImageVersionOutput = false
+
+# FLATPAK OPTIONS
+FlatpakPlatformRuntime = org.freedesktop.Platform
+FlatpakPlatformSdk = org.freedesktop.Sdk
+FlatpakPlatformVersion = 22.08
+FlatpakFinishArgs = """
+    --socket=wayland
+    --socket=x11
+    --filesystem=host
+    --share=network
+"""
+FlatpakBuilderArgs =
+
+# WINDOWS SETUP OPTIONS
+SetupCommandPrompt =
+SetupMinWindowsVersion = 10
+SetupSignTool =
+SetupVersionOutput = false
diff --git a/AvantGarde/App.axaml b/AvantGarde/App.axaml
@@ -1,12 +1,13 @@
 <Application xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:views="clr-namespace:AvantGarde.Views"
-        x:Class="AvantGarde.App"
 
         xmlns:vm="using:AvantGarde.ViewModels"
         x:DataType="vm:AvantViewModel"
+        x:Class="AvantGarde.App">
 
-        RequestedThemeVariant="Default">
+        <!-- TBD requires this above in Avalonia 11 -->
+        <!-- RequestedThemeVariant="Default" -->
 
     <Application.Styles>
         <FluentTheme />

diff --git a/AvantGarde/AvantGarde.csproj b/AvantGarde/AvantGarde.csproj
@@ -18,7 +18,7 @@
 		<Authors>Andy Thomas</Authors>
 		<Copyright>© Andy Thomas 2022-23</Copyright>
 		<Company>Kuiper Zone</Company>
-		<Description>Avant Garde is a cross-platform XAML previewer for the C# Avalonia Framework.</Description>
+		<Description>Avant Garde is a cross-platform XAML previewer for the Avalonia .NET Framework.</Description>
 		<Language>en-US</Language>
 		<PackageProjectUrl>https://github.com/kuiperzone/AvantGarde</PackageProjectUrl>
 		<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
@@ -36,15 +36,21 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="11.0.0-preview6" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview6" />
-		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.0-preview6" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview6" />
+		<PackageReference Include="Avalonia" Version="0.10.19" />
+		<PackageReference Include="Avalonia.Desktop" Version="0.10.19" />
+		<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.19" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.19" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview6" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.19" />
 
-		<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-preview6" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview6" />
+
+		<!-- TBD for removal in Avalonia 11 -->
+    	<PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
+
+		<!-- TBD Avalonia 11
+		<PackageReference Include="Avalonia.Themes.Simple" Version="11" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11" />
+		-->
 
 		<PackageReference Include="KuiperZone.Utility.Yaap" Version="2.0.0" />
 	</ItemGroup>

diff --git a/AvantGarde/Program.cs b/AvantGarde/Program.cs
@@ -76,7 +76,7 @@ public static int Main(string[] args)
             }
             catch (Exception e)
             {
-                Console.Error.WriteLine(e.Message);
+                Console.Error.WriteLine(e);
                 return 1;
             }
 

diff --git a/AvantGarde/Settings/AppSettings.cs b/AvantGarde/Settings/AppSettings.cs
@@ -18,6 +18,7 @@
 
 using Avalonia;
 using Avalonia.Media;
+using Avalonia.Themes.Fluent;
 using AvantGarde.Projects;
 using AvantGarde.ViewModels;
 
@@ -30,7 +31,12 @@ public sealed class AppSettings : JsonSettings
     {
         private const int MaxRecent = 10;
 
+        // TBD Removal in 11
+        private static FluentTheme? _theme;
+        private bool _isDarkTheme;
+
         private Application? _app;
+        private string _appFontFamily = GlobalModel.DefaultAppFamily;
         private double _appFontSize = GlobalModel.DefaultFontSize;
         private string _monoFontFamily = GlobalModel.DefaultMonoFamily;
         private double _monoFontSize = GlobalModel.DefaultFontSize;
@@ -49,13 +55,33 @@ public AppSettings()
         public AppSettings(Application app)
         {
             _app = app;
+            _theme = (FluentTheme)app.Styles[0];
         }
 
         /// <summary>
         /// Gets or sets the UI theme. Setting with instance constructed with Application
         /// will change the theme throughout.
         /// </summary>
         public bool IsDarkTheme
+        {
+            get { return _isDarkTheme; }
+            set
+            {
+                if (_isDarkTheme != value)
+                {
+                    _isDarkTheme = value;
+                    if (_app != null && _theme != null)
+                    {
+                        _theme.Mode = value ? FluentThemeMode.Dark : FluentThemeMode.Light;
+                        GlobalModel.Global.Assets.IsDarkTheme = value;
+                        GlobalModel.Global.Colors.IsDarkTheme = value;
+                    }
+                }
+            }
+        }
+
+        /* TBD Avalonia 11
+        public bool IsDarkTheme
         {
             get { return _app?.RequestedThemeVariant == Avalonia.Styling.ThemeVariant.Dark; }
 
@@ -67,10 +93,10 @@ public bool IsDarkTheme
                     GlobalModel.Global.Assets.IsDarkTheme = value;
                     GlobalModel.Global.Colors.IsDarkTheme = value;
                 }
-
-
             }
         }
+        */
+
 
         /// <summary>
         /// Gets or sets the application font size. Setting with instance constructed with Application
@@ -88,7 +114,8 @@ public double AppFontSize
                 {
                     _appFontSize = value;
 
-                    // We can only set this once
+                    // ContentControlThemeFontFamily
+                    // We can only set this once. This only works on Fluent.
                     // Until Window.FontSize can be used as way to change app FontSize,
                     // the application must be restarted to take effect.
                     // SEE: https://github.com/AvaloniaUI/Avalonia/discussions/7539
@@ -100,6 +127,31 @@ public double AppFontSize
             }
         }
 
+        /// <summary>
+        /// Gets or sets the application font family.
+        /// </summary>
+        public string AppFontFamily
+        {
+            get { return _appFontFamily; }
+
+            set
+            {
+                value = value.Trim();
+
+                if (value.Length == 0)
+                {
+                    value = GlobalModel.DefaultAppFamily;
+                }
+
+                _appFontFamily = value;
+
+                if (_app != null)
+                {
+                    GlobalModel.Global.AppFontFamily = new FontFamily(value);
+                }
+            }
+        }
+
         /// <summary>
         /// Gets or sets the application monospace font size. Setting with instance constructed with Application
         /// will change throughout application.
@@ -156,11 +208,6 @@ public string MonoFontFamily
         /// </summary>
         public PreviewWindowTheme PreviewTheme { get; set; }
 
-        /// <summary>
-        /// Gets or sets whether to pin main window.
-        /// </summary>
-        public bool IsTopmost { get; set; }
-
         /// <summary>
         /// Gets or sets whether window is maximized.
         /// </summary>
@@ -258,9 +305,9 @@ public void AssignFrom(AppSettings other)
             IsDarkTheme = other.IsDarkTheme;
             AppFontSize = other.AppFontSize;
             MonoFontSize = other.MonoFontSize;
+            AppFontFamily = other.AppFontFamily;
             MonoFontFamily = other.MonoFontFamily;
             PreviewTheme = other.PreviewTheme;
-            IsTopmost = other.IsTopmost;
             IsMaximized = other.IsMaximized;
             Width = other.Width;
             Height = other.Height;

diff --git a/AvantGarde/Utility/ControlExtension.cs b/AvantGarde/Utility/ControlExtension.cs
@@ -75,7 +75,8 @@ public static Window GetOwnerWindow(this StyledElement control)
 
             if (control.Parent != null)
             {
-                return GetOwnerWindow(control.Parent);
+                // TBD remove cast with Avalonia 11
+                return GetOwnerWindow((StyledElement)control.Parent);
             }
 
             throw new ArgumentException("Element has no owner window");

diff --git a/AvantGarde/ViewModels/GlobalModel.cs b/AvantGarde/ViewModels/GlobalModel.cs
@@ -30,6 +30,7 @@ public class GlobalModel : ReactiveObject
     {
         private double _appFontSize = DefaultFontSize;
         private double _monoFontSize = DefaultFontSize;
+        private FontFamily _appFontFamily = DefaultAppFamily;
         private FontFamily _monoFontFamily = DefaultMonoFamily;
 
         /// <summary>
@@ -47,23 +48,37 @@ protected GlobalModel()
         /// <summary>
         /// Maximum font size.
         /// </summary>
-        public const double MaxFontSize = 24;
+        public const double MaxFontSize = 32;
 
         /// <summary>
         /// Default font size.
         /// </summary>
         public const double DefaultFontSize = 14;
 
+        /// <summary>
+        /// Default app font family.
+        /// </summary>
+        public const string DefaultAppFamily = "Ubuntu, Noto Sans, sans";
+
         /// <summary>
         /// Default mono font family.
         /// </summary>
         public const string DefaultMonoFamily = "Source Code Pro, monospace";
 
+        /// <summary>
+        /// Gets the web page link name.
+        /// </summary>
         public static string WebPage { get; } = "Project Page";
 
+        /// <summary>
+        /// Gets the web page link URL.
+        /// </summary>
         public static string WebUrl { get; } = "https://github.com/kuiperzone/AvantGarde";
 
-        public static string Copyright { get; } = "Copyright 2023 Andy Thomas";
+        /// <summary>
+        /// Gets the copyright string.
+        /// </summary>
+        public static string Copyright { get; } = "Copyright (C) 2022-23 Andy Thomas";
 
         /// <summary>
         /// Gets the application version.
@@ -161,6 +176,23 @@ public double MonoFontSize
             }
         }
 
+        /// <summary>
+        /// Gets or sets the application font family.
+        /// </summary>
+        public FontFamily AppFontFamily
+        {
+            get { return _appFontFamily; }
+
+            set
+            {
+                if (_appFontFamily.Name != value)
+                {
+                    _appFontFamily = value;
+                    this.RaisePropertyChanged(nameof(AppFontFamily));
+                }
+            }
+        }
+
         /// <summary>
         /// Gets or sets the monospace font family.
         /// </summary>

diff --git a/AvantGarde/ViewModels/MainWindowViewModel.cs b/AvantGarde/ViewModels/MainWindowViewModel.cs
@@ -42,7 +42,6 @@ public class MainWindowViewModel : PreviewOptionsViewModel
         public MainWindowViewModel()
         {
             _isWelcomeVisible = App.Settings.ShowWelcome;
-            _isTopmost = App.Settings.IsTopmost;
             UpdateRecentMenu();
         }
 
@@ -76,9 +75,6 @@ public bool IsTopmost
                         Owner.Topmost = value;
                     }
 
-                    App.Settings.IsTopmost = value;
-                    App.Settings.Write();
-
                     this.RaisePropertyChanged(nameof(IsTopmost));
                 }
             }