Work in progress on UI

kierepka · Oct 8, 2024 · 43364ab · 43364ab
1 parent a26ef63
commit 43364ab
Show file tree

Hide file tree

Showing 11 changed files with 886 additions and 689 deletions.
diff --git a/ChatAAC/Converters/StringToBitmapConverter.cs b/ChatAAC/Converters/StringToBitmapConverter.cs
@@ -1,4 +1,3 @@
-using Avalonia;
 using Avalonia.Data.Converters;
 using Avalonia.Media.Imaging;
 using System;

diff --git a/ChatAAC/Models/AiResponse.cs b/ChatAAC/Models/AiResponse.cs
@@ -2,14 +2,8 @@
 
 namespace ChatAAC.Models;
 
-public class AiResponse
+public class AiResponse(string responseText)
 {
-    public string ResponseText { get; set; }
-    public DateTime Timestamp { get; set; }
-
-    public AiResponse(string responseText)
-    {
-        ResponseText = responseText;
-        Timestamp = DateTime.Now;
-    }
+    public string ResponseText { get; set; } = responseText;
+    public DateTime Timestamp { get; set; } = DateTime.Now;
 }
diff --git a/ChatAAC/Models/Obf/Button.cs b/ChatAAC/Models/Obf/Button.cs
@@ -8,7 +8,7 @@ public class Button
 {
     [JsonPropertyName("id")]
     [JsonConverter(typeof(IntFromStringConverter))]
-    public int Id { get; set; }
+    public int? Id { get; set; }
 
     [JsonPropertyName("label")] public string Label { get; set; } = string.Empty;
 
@@ -20,36 +20,9 @@ public class Button
 
     [JsonPropertyName("vocalization")] public string Vocalization { get; set; } = string.Empty;
 
-    [JsonPropertyName("load_board")] public LoadBoard? LoadBoard { get; set; } 
+    [JsonPropertyName("load_board")] public LoadBoard? LoadBoard { get; set; }
 
     [JsonPropertyName("action")] public string Action { get; set; } = string.Empty;
 
     [JsonIgnore] public Image? Image { get; set; }
-
-    private const int ImageWidth = 260;
-    private const int ImageHeight = 290;
-
-    [JsonIgnore]
-    public int Width
-    {
-        get
-        {
-            var width = Image?.Width + 10;
-            if (width <= 10) width = ImageWidth;
-            if (width > ImageWidth) width = ImageWidth;
-            return width ?? ImageWidth;
-        }
-    }
-
-    [JsonIgnore]
-    public int Height
-    {
-        get
-        {
-            var height = Image?.Height + 30;
-            if (height <= 30) height = ImageHeight;
-            if (height > ImageHeight) height = ImageHeight;
-            return height ?? ImageHeight;
-        }
-    }
 }
diff --git a/ChatAAC/Models/Obf/ObfFile.cs b/ChatAAC/Models/Obf/ObfFile.cs
@@ -18,7 +18,7 @@ public class ObfFile
 
     [JsonPropertyName("description_html")] public string DescriptionHtml { get; set; } = string.Empty;
 
-    [JsonPropertyName("grid")] public Grid Grid { get; set; } = new();
+    [JsonPropertyName("grid")] public Grid? Grid { get; set; } 
     [JsonPropertyName("buttons")] public List<Button> Buttons { get; set; } = new();
     [JsonPropertyName("images")] public List<Image> Images { get; set; } = new();