Main, General MVVM

Author: meruune

.github/workflows/build.yml

@@ -33,6 +33,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Inject build commit hash
+        shell: pwsh
+        run: |
+          (Get-Content Amethyst/Classes/AppData.cs) -replace 'AZ_BUILD_NUMBER', $env:GITHUB_SHA | Set-Content Amethyst/Classes/AppData.cs
+
       - name: Set up .NET
         uses: actions/setup-dotnet@v3
         with:

Amethyst/Amethyst.csproj

@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
+    <AvaloniaResource Remove="Assets\Sounds\**" />
   </ItemGroup>
 
   <ItemGroup>
@@ -21,13 +22,10 @@
   </ItemGroup>
 
 	<ItemGroup>
-		<Content Include="Strings\**">
+		<Content Include="Strings\**" Visible="False">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
-	</ItemGroup>
-
-	<ItemGroup>
-		<Content Include="Assets/Sounds\**">
+		<Content Include="Assets\Sounds\**" Visible="False">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
 	</ItemGroup>

Amethyst/App.axaml.cs

@@ -141,7 +141,6 @@ private async Task SetupCoreApplication()
 
         Logger.Info($"Amethyst version: {AppData.VersionString}");
         Logger.Info($"Amethyst web API version: {AppData.ApiVersion}");
-        Logger.Info("Amethyst build commit: AZ_COMMIT_SHA");
 
         // Read saved settings
         Logger.Info("Reading base app settings...");

Amethyst/Classes/Interfacing.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -36,12 +37,8 @@ public static bool
     // Update check
     public static bool
         UpdateFound = false,
-        ManualUpdate = false,
         UpdatingNow = false;
 
-    // Update file
-    public static string UpdateFileName = null;
-
     // Position helpers for devices -> GUID, Pose
     public static readonly SortedDictionary<string, (Vector3 Position, Quaternion Orientation)>
         DeviceHookJointPosition = new(); // This one applies to both
@@ -92,18 +89,12 @@ public static bool
     // Amethyst language resource trees
     private static LocalisationFileJson _localResources = new(), _englishResources = new();
 
-    // Is NUX currently opened?
-    public static bool IsNuxPending = false;
-
     // Flip defines for the base device - iteration persistent
     public static bool BaseFlip = false; // Assume non flipped
 
     // Flip defines for the override device - iteration persistent
     public static bool OverrideFlip = false; // Assume non flipped
 
-    // For the relay module to override the "Relay active" bar
-    public static (string Title, string Content, string Button, Action Click, bool Closable)? RelayBarOverride = null;
-
     public static bool IsServiceEndpointPresent => ServiceEndpointStatusCode == 0;
 
     public static AppSettingsReadEventHandler AppSettingsRead { get; set; } = (_, _) => { };
@@ -1139,4 +1130,11 @@ public static void RefreshApplicationInterface()
             });
         }
     }
+
+    [SuppressMessage("ReSharper", "ExplicitCallerInfoArgument")]
+    public static string Localized(this string s, [CallerLineNumber] int lineNumber = 0, [CallerFilePath] string filePath = "",
+        [CallerMemberName] string memberName = "")
+    {
+        return LocalizedJsonString(s, lineNumber, filePath, memberName);
+    }
 }

Amethyst/Classes/Shared.cs

@@ -1,4 +1,5 @@
 using Amethyst.Utils;
+using Amethyst.ViewModels;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Media;
@@ -44,6 +45,8 @@ public static readonly ManualResetEvent
         public static RaisedEvent RequestJointSettingsRefreshEvent;
         public static RaisedEvent RequestReloadRemoteDevicesEvent;
 
+        public static EventHandler<bool> OnAllowNavigationChanged;
+
         public static void RequestInterfaceReload(bool all = true)
         {
             if (!General.GeneralTabSetupFinished)
@@ -72,36 +75,39 @@ public static class Main
         // Vector of std.pair holding the Navigation Tag and the relative Navigation Page.
         public static List<(string Tag, Type Page)> Pages;
 
+        public static MainViewModel Context;
+        
+        // Info bars
+        public static NoticeViewModel PluginsUpdatePendingInfoBar => Context.Notices[NoticeType.PluginsUpdatePending];
+        public static NoticeViewModel PluginsInstallInfoBar => Context.Notices[NoticeType.PluginsInstall];
+        public static NoticeViewModel PluginsUninstallInfoBar => Context.Notices[NoticeType.PluginsUninstall];
+        public static NoticeViewModel NoticeInfoBar => Context.Notices[NoticeType.NoticeInfo];
+        public static NoticeViewModel ReloadInfoBar => Context.Notices[NoticeType.Reload];
+        public static NoticeViewModel UpdateDownloadingInfoBar => Context.Notices[NoticeType.UpdateDownloading];
+        public static NoticeViewModel UpdateInfoBar => Context.Notices[NoticeType.Update];
+
         // Main Window
         public static Mutex ApplicationMultiInstanceMutex;
         public static bool MainWindowLoaded = false;
 
         public static Window Window;
 
         public static Grid
-            InterfaceBlockerGrid, NavigationBlockerGrid, MainGrid;
+            InterfaceBlockerGrid, MainGrid;
 
         public static NavigationView MainNavigationView;
         public static Frame MainContentFrame;
-        public static TextBlock AppTitleLabel;
 
         public static SolidColorBrush
-            AttentionBrush, NeutralBrush;
-
-        public static ProgressBar PluginsUpdatePendingProgressBar;
-
-        public static InfoBar
-            PluginsUpdatePendingInfoBar,
-            PluginsInstallInfoBar,
-            PluginsUninstallInfoBar,
-            PluginsUpdateInfoBar;
+            AttentionBrush, NeutralBrush, 
+            CriticalBrush, PrimaryBrush;
 
         public static Flyout EulaFlyout;
         public static TextBlock EulaHeader;
         public static MarkdownScrollViewer EulaText;
 
         public static bool EulaFlyoutResult;
-        public static SemaphoreSlim EulaFlyoutClosed = new(0);
+        public static readonly SemaphoreSlim EulaFlyoutClosed = new(0);
         public static INotificationManager NotificationManager; // TODO
 
         public static TopLevel TopLevel
@@ -139,7 +145,7 @@ public static void NavigateToPage(string navItemTag,
             Interfacing.CurrentPageClass = page.FullName; // Cache the current page tag
 
             ReloadNavigationIcons();
-            
+
             MainContentFrame.Navigate(page, null, transitionInfo);
         }
 
@@ -262,22 +268,14 @@ public static class General
         // General Page
         public static bool GeneralTabSetupFinished = false;
         public static ToggleButton ToggleTrackersButton;
-        public static ToggleSplitButton SkeletonToggleButton;
-        public static CheckBox ForceRenderCheckBox;
         public static MenuFlyoutItem OffsetsButton;
-
-        public static Button
-            CalibrationButton, ServiceSettingsButton;
+        public static Button CalibrationButton;
 
         public static TextBlock
             DeviceNameLabel,
             DeviceStatusLabel,
             ErrorWhatText,
             TrackingDeviceErrorLabel,
-            ServerStatusLabel,
-            ServerErrorLabel,
-            ServerErrorWhatText,
-            ForceRenderText,
             ToggleTrackersButtonText;
 
         public static Grid
@@ -286,9 +284,6 @@ public static Grid
         public static Border
             ErrorWhatGrid;
 
-        public static Border
-            ServerErrorWhatGrid;
-
         public static ToggleButton
             ToggleFreezeButton;
 
@@ -395,10 +390,11 @@ public static void ReloadSelectedDeviceSync(bool manual, bool reconnect = false)
             }
         }
 
-        public static async Task ReloadSelectedDevice(bool manual, bool reconnect = false)
+        public static Task ReloadSelectedDevice(bool manual, bool reconnect = false)
         {
             // Reload the device
             ReloadSelectedDeviceSync(manual, reconnect);
+            return Task.CompletedTask;
         }
     }
 
@@ -408,8 +404,6 @@ public static class MainPage
         {
             public static TeachingTip
                 InitializerTeachingTip, EndingTeachingTip;
-
-            public static InfoBar ReloadInfoBar;
         }
 
         public static class GeneralPage