Implement BrandingProvider changes.

immense · Aug 17, 2023 · dff5830 · dff5830
1 parent a41ac65
commit dff5830
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/Desktop.Shared/Services/BrandingProvider.cs b/Desktop.Shared/Services/BrandingProvider.cs
@@ -3,20 +3,10 @@
 using Immense.RemoteControl.Shared;
 using Immense.RemoteControl.Shared.Models;
 using Microsoft.Extensions.Logging;
-using Remotely.Shared;
 using Remotely.Shared.Entities;
-using Remotely.Shared.Enums;
 using Remotely.Shared.Services;
-using Remotely.Shared.Utilities;
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
 using System.Net.Http.Json;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Desktop.Shared.Services;
 
@@ -41,11 +31,14 @@ public BrandingProvider(
         _logger = logger;
     }
 
-    public async Task<BrandingInfoBase> GetBrandingInfo()
+    public BrandingInfoBase CurrentBranding => _brandingInfo ??
+        throw new InvalidOperationException("Branding info has not been set or initialized.");
+
+    public async Task Initialize()
     {
         if (_brandingInfo is not null)
         {
-            return _brandingInfo;
+            return;
         }
 
         var result = await TryGetBrandingInfo();
@@ -71,7 +64,6 @@ public async Task<BrandingInfoBase> GetBrandingInfo()
 
             _brandingInfo.Icon = ms.ToArray();
         }
-        return _brandingInfo;
     }
 
     public void SetBrandingInfo(BrandingInfoBase brandingInfo)

diff --git a/Desktop.Win/Desktop.Win.csproj b/Desktop.Win/Desktop.Win.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net7.0-windows</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
     <AssemblyName>Remotely_Desktop</AssemblyName>
     <RootNamespace>Remotely.Desktop.Win</RootNamespace>
     <ApplicationIcon>Assets\favicon.ico</ApplicationIcon>

diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl
+5 −0		Immense.RemoteControl.Desktop.Linux/Services/AppStartup.cs
+2 −1		Immense.RemoteControl.Desktop.Shared/Abstractions/IBrandingProvider.cs
+1 −2		Immense.RemoteControl.Desktop.Shared/Properties/AssemblyInfo.cs
+23 −1		Immense.RemoteControl.Desktop.Shared/Services/EnvironmentHelper.cs
+1 −2		Immense.RemoteControl.Desktop.UI/Properties/AssemblyInfo.cs
+2 −29		Immense.RemoteControl.Desktop.UI/ViewModels/BrandedViewModelBase.cs
+1 −1		Immense.RemoteControl.Desktop.UI/ViewModels/FileTransferWindowViewModel.cs
+4 −4		Immense.RemoteControl.Desktop.UI/ViewModels/MainViewViewModel.cs
+2 −2		Immense.RemoteControl.Desktop.UI/Views/FileTransferWindow.axaml.cs
+0 −1		Immense.RemoteControl.Desktop.UI/Views/MainWindow.axaml.cs
+2 −2		Immense.RemoteControl.Desktop.UI/Views/SessionIndicatorWindow.axaml.cs
+5 −0		Immense.RemoteControl.Desktop.Windows/Services/AppStartup.cs
+1 −1		Immense.RemoteControl.Desktop.Windows/Services/SessionIndicatorWin.cs