about summary refs log tree commit diff
path: root/MatrixUtils.Desktop/Components
diff options
context:
space:
mode:
authorRory& <root@rory.gay>2024-01-24 02:31:56 +0100
committerRory& <root@rory.gay>2024-01-24 17:05:25 +0100
commit03313562d21d5db9bf6a14ebbeab80e06c883d3a (patch)
treee000546a2ee8e6a886a7ed9fd01ad674178fb7cb /MatrixUtils.Desktop/Components
parentMake RMU installable (diff)
downloadMatrixUtils-03313562d21d5db9bf6a14ebbeab80e06c883d3a.tar.xz
MRU->RMU, fixes, cleanup
Diffstat (limited to '')
-rw-r--r--MatrixUtils.Desktop/Components/NavigationStack.axaml (renamed from MatrixRoomUtils.Desktop/Components/NavigationStack.axaml)2
-rw-r--r--MatrixUtils.Desktop/Components/NavigationStack.axaml.cs (renamed from MatrixRoomUtils.Desktop/Components/NavigationStack.axaml.cs)2
-rw-r--r--MatrixUtils.Desktop/Components/Pages/RoomList.axaml (renamed from MatrixRoomUtils.Desktop/Components/Pages/RoomList.axaml)8
-rw-r--r--MatrixUtils.Desktop/Components/Pages/RoomList.axaml.cs (renamed from MatrixRoomUtils.Desktop/Components/Pages/RoomList.axaml.cs)4
-rw-r--r--MatrixUtils.Desktop/Components/RoomListEntry.axaml (renamed from MatrixRoomUtils.Desktop/Components/RoomListEntry.axaml)4
-rw-r--r--MatrixUtils.Desktop/Components/RoomListEntry.axaml.cs (renamed from MatrixRoomUtils.Desktop/Components/RoomListEntry.axaml.cs)6
6 files changed, 13 insertions, 13 deletions
diff --git a/MatrixRoomUtils.Desktop/Components/NavigationStack.axaml b/MatrixUtils.Desktop/Components/NavigationStack.axaml

index bc6b75d..b24895d 100644 --- a/MatrixRoomUtils.Desktop/Components/NavigationStack.axaml +++ b/MatrixUtils.Desktop/Components/NavigationStack.axaml
@@ -3,7 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="MatrixRoomUtils.Desktop.Components.NavigationStack"> + x:Class="MatrixUtils.Desktop.Components.NavigationStack"> <StackPanel x:Name="dock"> <Label>NagivationStack</Label> <StackPanel x:Name="navPanel" Orientation="Horizontal"></StackPanel> diff --git a/MatrixRoomUtils.Desktop/Components/NavigationStack.axaml.cs b/MatrixUtils.Desktop/Components/NavigationStack.axaml.cs
index 92c617b..632ae3c 100644 --- a/MatrixRoomUtils.Desktop/Components/NavigationStack.axaml.cs +++ b/MatrixUtils.Desktop/Components/NavigationStack.axaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; -namespace MatrixRoomUtils.Desktop.Components; +namespace MatrixUtils.Desktop.Components; public partial class NavigationStack : UserControl { public NavigationStack() { diff --git a/MatrixRoomUtils.Desktop/Components/Pages/RoomList.axaml b/MatrixUtils.Desktop/Components/Pages/RoomList.axaml
index 0e43d99..45778f3 100644 --- a/MatrixRoomUtils.Desktop/Components/Pages/RoomList.axaml +++ b/MatrixUtils.Desktop/Components/Pages/RoomList.axaml
@@ -2,12 +2,12 @@ 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" - xmlns:components="clr-namespace:MatrixRoomUtils.Desktop.Components.Pages" - xmlns:components1="clr-namespace:MatrixRoomUtils.Desktop.Components" - xmlns:abstractions="clr-namespace:MatrixRoomUtils.Abstractions;assembly=MatrixRoomUtils.Abstractions" + xmlns:components="clr-namespace:MatrixUtils.Desktop.Components.Pages" + xmlns:components1="clr-namespace:MatrixUtils.Desktop.Components" + xmlns:abstractions="clr-namespace:MatrixUtils.Abstractions;assembly=MatrixUtils.Abstractions" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="MatrixRoomUtils.Desktop.Components.Pages.RoomList" + x:Class="MatrixUtils.Desktop.Components.Pages.RoomList" x:DataType="components:RoomList" DataContext="{Binding $self}" > diff --git a/MatrixRoomUtils.Desktop/Components/Pages/RoomList.axaml.cs b/MatrixUtils.Desktop/Components/Pages/RoomList.axaml.cs
index 53c3063..a0c9fcc 100644 --- a/MatrixRoomUtils.Desktop/Components/Pages/RoomList.axaml.cs +++ b/MatrixUtils.Desktop/Components/Pages/RoomList.axaml.cs
@@ -2,9 +2,9 @@ using System.Collections.ObjectModel; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -using MatrixRoomUtils.Abstractions; +using MatrixUtils.Abstractions; -namespace MatrixRoomUtils.Desktop.Components.Pages; +namespace MatrixUtils.Desktop.Components.Pages; public partial class RoomList : UserControl { private ObservableCollection<RoomInfo> Rooms { get; set; } = new(); diff --git a/MatrixRoomUtils.Desktop/Components/RoomListEntry.axaml b/MatrixUtils.Desktop/Components/RoomListEntry.axaml
index db22ccc..97e6fdc 100644 --- a/MatrixRoomUtils.Desktop/Components/RoomListEntry.axaml +++ b/MatrixUtils.Desktop/Components/RoomListEntry.axaml
@@ -2,9 +2,9 @@ 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" - xmlns:components="clr-namespace:MatrixRoomUtils.Desktop.Components" + xmlns:components="clr-namespace:MatrixUtils.Desktop.Components" mc:Ignorable="d" d:DesignWidth="250" d:DesignHeight="32" - x:Class="MatrixRoomUtils.Desktop.Components.RoomListEntry" + x:Class="MatrixUtils.Desktop.Components.RoomListEntry" x:DataType="components:RoomListEntry" DataContext="{Binding $self}" diff --git a/MatrixRoomUtils.Desktop/Components/RoomListEntry.axaml.cs b/MatrixUtils.Desktop/Components/RoomListEntry.axaml.cs
index 73115a2..1e4a127 100644 --- a/MatrixRoomUtils.Desktop/Components/RoomListEntry.axaml.cs +++ b/MatrixUtils.Desktop/Components/RoomListEntry.axaml.cs
@@ -7,11 +7,11 @@ using LibMatrix.EventTypes.Spec.State.RoomInfo; using LibMatrix.Helpers; using LibMatrix.Interfaces.Services; using LibMatrix.Services; -using MatrixRoomUtils.Abstractions; +using MatrixUtils.Abstractions; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace MatrixRoomUtils.Desktop.Components; +namespace MatrixUtils.Desktop.Components; public partial class RoomListEntry : UserControl { public RoomInfo Room { get; set; } @@ -47,7 +47,7 @@ public partial class RoomListEntry : UserControl { var resolvedUrl = await Room.Room.GetResolvedRoomAvatarUrlAsync(); // await using var svc = _serviceScopeFactory.CreateAsyncScope(); - // var hs = await svc.ServiceProvider.GetService<MRUStorageWrapper>()?.GetCurrentSessionOrPrompt()!; + // var hs = await svc.ServiceProvider.GetService<RMUStorageWrapper>()?.GetCurrentSessionOrPrompt()!; // var hsResolver = svc.ServiceProvider.GetService<HomeserverResolverService>(); // var storage = svc.ServiceProvider.GetService<TieredStorageService>()?.CacheStorageProvider; // var resolvedUrl = await hsResolver.ResolveMediaUri(hs.ServerName, mxcUrl);