More theming

Also fixed the stop when loading in the installed themes

Author: Azyyyyyy

MultiRPC/Logging/LoggingPageLogger.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Avalonia.Controls;
+using Avalonia.Media;
 using Avalonia.Threading;
 using TinyUpdate.Core.Logging;
 
@@ -78,7 +79,8 @@ private static TextBlock MakeTextBlock(string header, string message)
     {
         return new TextBlock()
         {
-            Text = header + " " + message
+            Text = header + " " + message,
+            Foreground = Brushes.White
         };
     }
 

MultiRPC/Theming/Theme.cs

@@ -180,8 +180,11 @@ public void ReloadAssets()
         UnloadAssets();
 
         var fileStream = StreamUtil.SafeOpenRead(_filepath);
-        _archive = new ZipArchive(fileStream, ZipArchiveMode.Read);
-        _archiveLoaded = true;
+        if (fileStream != null)
+        {
+            _archive = new ZipArchive(fileStream, ZipArchiveMode.Read);
+            _archiveLoaded = true;
+        }
     }
 
     public void UnloadAssets()
@@ -214,6 +217,13 @@ public void Apply(IResourceDictionary? resourceDictionary = null)
         resourceDictionary["NavButtonSelectedColor"] = Colours.NavButtonSelectedColor;
         resourceDictionary["NavButtonSelectedIconColor"] = Colours.NavButtonSelectedIconColor;
         resourceDictionary["ThemeForegroundBrush"] = new SolidColorBrush(Colours.TextColour);
+
+        resourceDictionary["CheckBoxForegroundUnchecked"] = resourceDictionary["ThemeForegroundBrush"];
+        resourceDictionary["CheckBoxForegroundChecked"] = resourceDictionary["ThemeForegroundBrush"];
+        resourceDictionary["CheckBoxForegroundCheckedPointerOver"] = resourceDictionary["ThemeForegroundBrush"];
+        resourceDictionary["CheckBoxForegroundUncheckedPointerOver"] = resourceDictionary["ThemeForegroundBrush"];
+        resourceDictionary["CheckBoxForegroundCheckedPressed"] = resourceDictionary["ThemeForegroundBrush"];
+        resourceDictionary["CheckBoxForegroundUncheckedPressed"] = resourceDictionary["ThemeForegroundBrush"];
 
         AssetManager.FireReloadAssets(this);
     }

MultiRPC/UI/App.axaml.cs

@@ -20,6 +20,12 @@
 
 namespace MultiRPC.UI;
 
+/*TODO:
+ * Styling:
+   * CheckBox (Actual Box)
+   * Tooltip
+   * Text on purple RpcView
+   * Min/Max Buttons*/
 public class App : Application
 {
     public static readonly HttpClient HttpClient = new HttpClient();

MultiRPC/UI/MainWindow.axaml.cs

@@ -78,7 +78,7 @@ public MainWindow() : this(new MainPage())
     private void DragEnter(object? sender, DragEventArgs e)
     {
         // Only allow Copy or Link as Drop Operations.
-        e.DragEffects = e.DragEffects & (DragDropEffects.Copy | DragDropEffects.Link);
+        e.DragEffects &= DragDropEffects.Copy | DragDropEffects.Link;
 
         // Only allow if the dragged data contains text or filenames.
         if (!e.Data.Contains(DataFormats.FileNames))

MultiRPC/UI/Pages/Theme/InstalledThemes.axaml.cs

@@ -10,13 +10,15 @@
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
+using MultiRPC.Extensions;
 using MultiRPC.Setting;
 using MultiRPC.Setting.Settings;
 using MultiRPC.Theming;
 using MultiRPC.UI.Controls;
 
 namespace MultiRPC.UI.Pages.Theme;
 
+//TODO: Make it faster when loading in the theme
 //TODO: Add Showing/Active/Editing Text
 //TODO: Disable Remove button on active theme
 //TODO: Add Edit button when theme editor has progress
@@ -41,9 +43,11 @@ public void Initialize(bool loadXaml)
             return;
         }
 
-        wppThemes.Children.AddRange(
-            Directory.EnumerateFiles(_themeLocation)
-                .Select(MakePreviewUI));
+        _ = Task.Run(() =>
+        {
+            var files = Directory.GetFiles(_themeLocation);
+            MakePreviewUIs(files);
+        });
     }
 
     private void OnAttachedToLogicalTree(object? sender, LogicalTreeAttachmentEventArgs e)
@@ -64,7 +68,22 @@ private void OnDetachedFromLogicalTree(object? sender, LogicalTreeAttachmentEven
     private async void BtnAdd_OnClick(object? sender, RoutedEventArgs e) => await GetTheme(false);
     private async void BtnAddAndApply_OnClick(object? sender, RoutedEventArgs e) => await GetTheme(true);
 
-    private Control MakePreviewUI(string file) => MakePreviewUI(Theming.Theme.Load(file), file);
+    private async void MakePreviewUIs(string[] files)
+    {
+        foreach (var file in files)
+        {
+            /*Funnily enough, if we load in things too
+             fast then it'll make the whole UI unresponsive*/
+            await Task.Delay(50);
+            var theme = Theming.Theme.Load(file);
+            this.RunUILogic(() =>
+            {
+                var control = MakePreviewUI(theme, file);
+                wppThemes.Children.Add(control);
+            });
+        }
+    }
+
     private Control MakePreviewUI(Theming.Theme? theme, string? file = null)
     {
         if (theme == null)
@@ -90,7 +109,7 @@ private Control MakePreviewUI(Theming.Theme? theme, string? file = null)
         {
             DataContext = Language.GetLanguage("Remove"),
             [!ContentProperty] = new Binding("TextObservable^"),
-            IsEnabled = editButton.IsEnabled,
+            IsEnabled = false,//editButton.IsEnabled,
             Tag = theme,
         };
         removeButton.Click += RemoveButtonOnClick;
@@ -123,10 +142,14 @@ private Control MakePreviewUI(Theming.Theme? theme, string? file = null)
         };
 
         var themeUI = new ThemePreview(theme)
-            { Margin = new Thickness(0, 0, 15, 15) };
+        {
+            Margin = new Thickness(0, 0, 15, 15)
+        };
         themeUI.PointerEnter += ThemeUIOnPointerEnter;
         themeUI.PointerLeave += ThemeUIOnPointerLeave;
         themeUI.DoubleTapped += ThemeUIOnDoubleTapped;
+        themeUI.AttachedToLogicalTree += (sender, args) => _ = Task.Run(theme.ReloadAssets);
+        themeUI.DetachedFromLogicalTree += (sender, args) => _ = Task.Run(theme.UnloadAssets);
         return new StackPanel
         {
             Children =
@@ -137,25 +160,33 @@ private Control MakePreviewUI(Theming.Theme? theme, string? file = null)
         };
     }
 
+    private Theming.Theme? _tmpTheme;
     private void ThemeUIOnPointerLeave(object? sender, PointerEventArgs e)
     {
         //We want to restore the old theme if it didn't become the new active theme
         var th = (ThemePreview)sender!;
-        if (_activeTheme != th.Theme)
+        if (_tmpTheme != null
+            && _activeTheme != th.Theme)
         {
             _activeTheme?.Apply();
+            _tmpTheme = null;
         }
     }
 
     private async void ThemeUIOnPointerEnter(object? sender, PointerEventArgs e)
     {
-        await Task.Delay(1000);
+        await Task.Delay(500);
         var th = (ThemePreview)sender!;
-        if (_activeTheme != th.Theme 
-            && th.IsPointerOver)
+            
+        this.RunUILogic(() =>
         {
-            th.Theme.Apply();
-        }
+            if (_activeTheme != th.Theme
+                && th.IsPointerOver)
+            {
+                _tmpTheme = th.Theme;
+                th.Theme.Apply();
+            }
+        });
     }
 
     private readonly GeneralSettings _generalSettings = SettingManager<GeneralSettings>.Setting;

MultiRPC/UI/Pages/Theme/MasterThemeEditorPage.cs

@@ -14,7 +14,8 @@ public override void Initialize(bool loadXaml)
         var tabPage = new TabsPage
         {
             MinWidth = 675,
-            MinHeight = 520
+            MaxWidth = 997.5,
+            MaxHeight = 520
         };
         ContentPadding = new Thickness(0);
         tabPage.AddTabs(new ThemeEditorPage()

MultiRPC/UI/Pages/Theme/ThemePreview.axaml

@@ -15,6 +15,7 @@
         </Style>
     </UserControl.Styles>
     <UserControl.Resources>
+        <SolidColorBrush x:Key="ThemeForegroundBrush" Color="White" />
         <SolidColorBrush x:Key="ComboBoxDropDownBackground" Color="{DynamicResource ThemeAccentColor2}" />
         <SolidColorBrush x:Key="ThemeAccentBrush" Color="{DynamicResource ThemeAccentColor}"/>
         <SolidColorBrush x:Key="ThemeAccentBrush2" Color="{DynamicResource ThemeAccentColor2}"/>

MultiRPC/UI/Styling.axaml

@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:multirpc="clr-namespace:MultiRPC">
     <Design.PreviewWith>
@@ -41,8 +41,8 @@
     <Style Selector="ComboBox /template/ Path#DropDownGlyph">
         <Setter Property="Fill" Value="{DynamicResource ThemeAccentBrush4}" />
     </Style>
-    <Style Selector="ComboBox /template/ ContentControl#ContentPresenter">
-        <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Style Selector="ComboBox:pointerover /template/ Path#DropDownGlyph">
+        <Setter Property="Fill" Value="{DynamicResource ThemeAccentBrush5}" />
     </Style>
     <Style Selector="ComboBox">
         <Setter Property="Height" Value="{TemplateBinding MinHeight}" />
@@ -74,6 +74,17 @@
         <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ThemeAccentBrush4}" />
     </Style>
+
+    <Style Selector="TextBox:focus">
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+    <Style Selector="TextBox:focus /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark">
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+    <Style Selector="TextBox:pointerover /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark">
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+
     <Style Selector="TextBox:pointerover /template/ Border">
         <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ThemeAccentBrush5}" />
@@ -131,9 +142,11 @@
         <Setter Property="BorderThickness" Value="1" />
     </Style>
     <Style Selector="Button:pointerover /template/ ContentPresenter">
+        <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
         <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2Hover}" />
     </Style>
     <Style Selector="Button:pressed /template/ ContentPresenter">
+        <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
         <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush}" />
     </Style>
     <Style Selector="Button:disabled /template/ ContentPresenter">