Enable html view

wieslawsoltes · Apr 28, 2023 · bcd43a1 · bcd43a1
1 parent b6ecccc
commit bcd43a1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>preview.18</VersionSuffix>
+    <VersionSuffix>preview.19</VersionSuffix>
     <Authors>Wiesław Šoltés</Authors>
     <Company>Wiesław Šoltés</Company>
     <Copyright>Copyright © Wiesław Šoltés 2023</Copyright>
@@ -19,7 +19,7 @@
     <CommunityToolkitMvvmVersion>8.1.0</CommunityToolkitMvvmVersion>
     <MicrosoftExtensionsDependencyInjectionVersion>7.0.0</MicrosoftExtensionsDependencyInjectionVersion>
     <MarkdownAvaloniaVersion>11.0.0-b1</MarkdownAvaloniaVersion>
-    <AvaloniaHtmlRendererVersion>11.0.0-preview5</AvaloniaHtmlRendererVersion>
+    <AvaloniaHtmlRendererVersion>11.0.0-preview6</AvaloniaHtmlRendererVersion>
     <SystemCommandLineVersion>2.0.0-beta1.20104.2</SystemCommandLineVersion>
     <XUnitVersion>2.4.1</XUnitVersion>
     <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>

diff --git a/src/ChatGPT.UI/ChatGPT.UI.csproj b/src/ChatGPT.UI/ChatGPT.UI.csproj
@@ -24,8 +24,7 @@
     <!--<PackageReference Include="NodeEditorAvalonia" Version="$(NodeEditorVersion)" />-->
     <!--<PackageReference Include="NodeEditorAvalonia.Mvvm" Version="$(NodeEditorVersion)" />-->
     <PackageReference Include="Markdown.Avalonia" Version="$(MarkdownAvaloniaVersion)" />
-    <!-- TODO: -->
-    <!--<PackageReference Include="Avalonia.HtmlRenderer" Version="$(AvaloniaHtmlRendererVersion)" />-->
+    <PackageReference Include="Avalonia.HtmlRenderer" Version="$(AvaloniaHtmlRendererVersion)" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ChatGPT.Core\ChatGPT.Core.csproj" />

diff --git a/src/ChatGPT.UI/Views/Chat/ChatMessageView.axaml b/src/ChatGPT.UI/Views/Chat/ChatMessageView.axaml
@@ -72,9 +72,7 @@
                 </DataTemplate>
                 <!-- Html -->
                 <DataTemplate x:DataType="vm:ChatMessageViewModel" x:Key="HtmlDataTemplate">
-                  <!-- TODO: -->
-                  <!-- <messages:ChatHtmlMessageView /> -->
-                  <messages:ChatTextMessageView />
+                  <messages:ChatHtmlMessageView />
                 </DataTemplate>
               </dt:DataTemplateSelector.Resources>
             </dt:DataTemplateSelector>

diff --git a/src/ChatGPT.UI/Views/Chat/Messages/ChatHtmlMessageView.axaml b/src/ChatGPT.UI/Views/Chat/Messages/ChatHtmlMessageView.axaml
@@ -1,5 +1,4 @@
-<!-- TODO: -->
-<!--<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -16,5 +15,4 @@
                   IsVisible="{Binding Message, Converter={x:Static ObjectConverters.IsNotNull}}"
                   ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                   Classes.error="{Binding IsError}" />
-</UserControl>-->
-<UserControl xmlns="https://github.com/avaloniaui" />
+</UserControl>
diff --git a/src/ChatGPT.UI/Views/Chat/Messages/ChatHtmlMessageView.axaml.cs b/src/ChatGPT.UI/Views/Chat/Messages/ChatHtmlMessageView.axaml.cs
@@ -1,5 +1,4 @@
-// TODO:
-/*using Avalonia.Controls;
+using Avalonia.Controls;
 
 namespace ChatGPT.Views.Chat.Messages;
 
@@ -9,4 +8,4 @@ public ChatHtmlMessageView()
     {
         InitializeComponent();
     }
-}*/
+}