Split LibMatrix into submodule

7 files changed, 17 insertions, 18 deletions

diff --git a/MatrixRoomUtils.Desktop/App.axaml.cs b/MatrixRoomUtils.Desktop/App.axaml.cs

index 3fe8862..20f2a3c 100644
--- a/MatrixRoomUtils.Desktop/App.axaml.cs
+++ b/MatrixRoomUtils.Desktop/App.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using MatrixRoomUtils.Core.Services;
+using LibMatrix.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Sentry;
diff --git a/MatrixRoomUtils.Desktop/Components/RoomListEntry.axaml.cs b/MatrixRoomUtils.Desktop/Components/RoomListEntry.axaml.cs

index a447701..f29db63 100644
--- a/MatrixRoomUtils.Desktop/Components/RoomListEntry.axaml.cs
+++ b/MatrixRoomUtils.Desktop/Components/RoomListEntry.axaml.cs
@@ -1,10 +1,10 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Media.Imaging;
-using MatrixRoomUtils.Core;
-using MatrixRoomUtils.Core.Helpers;
-using MatrixRoomUtils.Core.Services;
-using MatrixRoomUtils.Core.StateEventTypes.Spec;
+using LibMatrix;
+using LibMatrix.Helpers;
+using LibMatrix.Services;
+using LibMatrix.StateEventTypes.Spec;
 using MatrixRoomUtils.Web.Classes;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/MatrixRoomUtils.Desktop/FileStorageProvider.cs b/MatrixRoomUtils.Desktop/FileStorageProvider.cs

index 6c44fd2..36a3c7e 100644
--- a/MatrixRoomUtils.Desktop/FileStorageProvider.cs
+++ b/MatrixRoomUtils.Desktop/FileStorageProvider.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
-using MatrixRoomUtils.Core.Extensions;
-using MatrixRoomUtils.Core.Interfaces.Services;
+using LibMatrix.Extensions;
+using LibMatrix.Interfaces.Services;
 using Microsoft.Extensions.Logging;
 
 namespace MatrixRoomUtils.Desktop;
diff --git a/MatrixRoomUtils.Desktop/MRUStorageWrapper.cs b/MatrixRoomUtils.Desktop/MRUStorageWrapper.cs

index a5494ad..5444f24 100644
--- a/MatrixRoomUtils.Desktop/MRUStorageWrapper.cs
+++ b/MatrixRoomUtils.Desktop/MRUStorageWrapper.cs
@@ -1,6 +1,6 @@
-using MatrixRoomUtils.Core;
-using MatrixRoomUtils.Core.Responses;
-using MatrixRoomUtils.Core.Services;
+using LibMatrix;
+using LibMatrix.Responses;
+using LibMatrix.Services;
 
 namespace MatrixRoomUtils.Desktop;
 
diff --git a/MatrixRoomUtils.Desktop/MainWindow.axaml.cs b/MatrixRoomUtils.Desktop/MainWindow.axaml.cs

index f89bbfa..89f9d52 100644
--- a/MatrixRoomUtils.Desktop/MainWindow.axaml.cs
+++ b/MatrixRoomUtils.Desktop/MainWindow.axaml.cs
@@ -25,8 +25,8 @@ public partial class MainWindow : Window {
 
         InitializeComponent();
 
-        _logger.LogInformation("Cache location: " + _configuration.CacheStoragePath);
-        _logger.LogInformation("Data location: " + _configuration.DataStoragePath);
+        _logger.LogInformation("Cache location: {}", _configuration.CacheStoragePath);
+        _logger.LogInformation("Data location: {}", _configuration.DataStoragePath);
 
 
         // for (int i = 0; i < 100; i++) {
@@ -40,7 +40,7 @@ public partial class MainWindow : Window {
         var hs = await _storageWrapper.GetCurrentSessionOrPrompt();
         var rooms = await hs.GetJoinedRooms();
         foreach (var room in rooms) {
-            roomList.Children.Add(new RoomListEntry(_scopeFactory, new RoomInfo(room)));
+            // roomList.Children.Add(new RoomListEntry(_scopeFactory, new RoomInfo(room)));
         }
         base.OnLoaded(e);
     }
diff --git a/MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj b/MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj

index 6f3e256..e6a8169 100644
--- a/MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj
+++ b/MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj
@@ -31,7 +31,7 @@
 
 
     <ItemGroup>
-        <ProjectReference Include="..\MatrixRoomUtils.Core\MatrixRoomUtils.Core.csproj" />
+        <ProjectReference Include="..\LibMatrix\LibMatrix\LibMatrix.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/MatrixRoomUtils.Desktop/RoomInfo.cs b/MatrixRoomUtils.Desktop/RoomInfo.cs

index a31d67a..fdd7d03 100644
--- a/MatrixRoomUtils.Desktop/RoomInfo.cs
+++ b/MatrixRoomUtils.Desktop/RoomInfo.cs
@@ -1,7 +1,6 @@
-using MatrixRoomUtils.Core;
-using MatrixRoomUtils.Core.Interfaces;
-using MatrixRoomUtils.Core.Responses;
-using MatrixRoomUtils.Core.RoomTypes;
+using LibMatrix;
+using LibMatrix.Responses;
+using LibMatrix.RoomTypes;
 
 namespace MatrixRoomUtils.Web.Classes;