Removed dependency on libadwaita in Linux

DevToys-app · Aug 15, 2024 · 3a3b9df · 3a3b9df
1 parent 7fd73a0
commit 3a3b9df
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/src/app/dev/DevToys.Blazor/wwwroot/css/devtoys.g.css b/src/app/dev/DevToys.Blazor/wwwroot/css/devtoys.g.css
diff --git a/src/app/dev/platforms/desktop/DevToys.Linux/Core/ThemeListener.cs b/src/app/dev/platforms/desktop/DevToys.Linux/Core/ThemeListener.cs
@@ -1,5 +1,4 @@
-using Adw;
-using DevToys.Api;
+using DevToys.Api;
 using DevToys.Core.Settings;
 using DevToys.Blazor.Components;
 using DevToys.Blazor.Core.Services;
@@ -13,7 +12,7 @@ internal sealed class ThemeListener : IThemeListener
 {
     private readonly ISettingsProvider _settingsProvider;
     private readonly Gtk.Settings _gtkSettings;
-    private readonly StyleManager _adwStyleManager;
+    //private readonly StyleManager _adwStyleManager;
 
     private Gtk.Window? _mainWindow;
     private bool _ignoreOperatingSystemSettingChanged;
@@ -25,7 +24,7 @@ public ThemeListener(ISettingsProvider settingsProvider)
         _settingsProvider = settingsProvider;
         _settingsProvider.SettingChanged += SettingsProvider_SettingChanged;
 
-        _adwStyleManager = StyleManager.GetDefault();
+        //_adwStyleManager = StyleManager.GetDefault();
 
         // Listen for operating system settings.
         _gtkSettings = Gtk.Settings.GetDefault()!;
@@ -68,12 +67,12 @@ public void ApplyDesiredColorTheme()
             if (theme == AvailableApplicationTheme.Dark)
             {
                 ActualAppTheme = ApplicationTheme.Dark;
-                _adwStyleManager.ColorScheme = ColorScheme.ForceDark;
+                //_adwStyleManager.ColorScheme = ColorScheme.ForceDark;
             }
             else
             {
                 ActualAppTheme = ApplicationTheme.Light;
-                _adwStyleManager.ColorScheme = ColorScheme.ForceLight;
+                //_adwStyleManager.ColorScheme = ColorScheme.ForceLight;
             }
 
             _ignoreOperatingSystemSettingChanged = false;
@@ -142,14 +141,19 @@ private bool GetBestValueForCompactMode()
 
     private void UpdateSystemSettingsAndApplyTheme()
     {
-        IsHighContrast = _adwStyleManager.HighContrast;
+        IsHighContrast
+            = _gtkSettings.GtkThemeName is not null
+              && _gtkSettings.GtkThemeName.Contains("high", StringComparison.OrdinalIgnoreCase)
+              && _gtkSettings.GtkThemeName.Contains("contrast", StringComparison.OrdinalIgnoreCase);
         CurrentSystemTheme = GetCurrentSystemTheme();
 
         ApplyDesiredColorTheme();
     }
 
     private AvailableApplicationTheme GetCurrentSystemTheme()
     {
-        return _gtkSettings.GtkApplicationPreferDarkTheme ? AvailableApplicationTheme.Dark : AvailableApplicationTheme.Light;
+        return _gtkSettings.GtkApplicationPreferDarkTheme || (_gtkSettings.GtkThemeName?.Contains("Dark", StringComparison.OrdinalIgnoreCase) ?? false)
+            ? AvailableApplicationTheme.Dark
+            : AvailableApplicationTheme.Light;
     }
 }
diff --git a/src/app/dev/platforms/desktop/DevToys.Linux/DevToys.Linux.csproj b/src/app/dev/platforms/desktop/DevToys.Linux/DevToys.Linux.csproj
@@ -10,7 +10,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GirCore.Adw-1" />
     <PackageReference Include="GirCore.Gtk-4.0" />
     <PackageReference Include="GirCore.WebKit-6.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebView" />

diff --git a/src/app/dev/platforms/desktop/DevToys.Linux/LinuxProgram.cs b/src/app/dev/platforms/desktop/DevToys.Linux/LinuxProgram.cs
@@ -31,7 +31,7 @@ internal partial class LinuxProgram
 
     internal LinuxProgram()
     {
-        Application = Adw.Application.New(null, Gio.ApplicationFlags.NonUnique);
+        Application = Gtk.Application.New(null, Gio.ApplicationFlags.NonUnique);
 
         GLib.Functions.SetPrgname("DevToys");
         // Set the human-readable application name for app bar and task list.
@@ -41,7 +41,7 @@ internal LinuxProgram()
         Application.OnShutdown += OnApplicationShutdown;
     }
 
-    internal Adw.Application Application { get; }
+    internal Gtk.Application Application { get; }
 
     private void OnApplicationActivate(object sender, object e)
     {
@@ -81,7 +81,7 @@ LanguageDefinition languageDefinition
         LanguageManager.Instance.SetCurrentCulture(languageDefinition);
 
         // Create and open main window.
-        _mainWindow = new MainWindow(serviceProvider, (Adw.Application)sender);
+        _mainWindow = new MainWindow(serviceProvider, (Gtk.Application)sender);
     }
 
     private void OnApplicationShutdown(object sender, object e)

diff --git a/src/app/dev/platforms/desktop/DevToys.Linux/MainWindow.cs b/src/app/dev/platforms/desktop/DevToys.Linux/MainWindow.cs
@@ -40,7 +40,7 @@ internal class MainWindow
     private readonly BlazorWebView _blazorGtkWebView;
     private readonly Gtk.Window _window;
 
-    internal MainWindow(IServiceProvider serviceProvider, Adw.Application application)
+    internal MainWindow(IServiceProvider serviceProvider, Gtk.Application application)
     {
         serviceProvider.GetService<IMefProvider>()!.SatisfyImports(this);
         Guard.IsNotNull(_themeListener);