Skip to content

Commit 40754f8

Browse files
AzyyyyyyAzyyyyyy
committed
Added small things
Added Admin in title if user is admin Added about settings tab (To be finished) Added Network overlay
1 parent 19b13fc commit 40754f8

14 files changed

+178
-8
lines changed

‎MultiRPC/Assets/Icons/Browser.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎MultiRPC/Assets/Icons/Fluxpoint.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎MultiRPC/Assets/Icons/Github.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎MultiRPC/Assets/Language/en-gb.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,5 +224,7 @@
224224
"Discord": "Discord",
225225
"DiscordPTB": "Discord PTB",
226226
"DiscordCanary": "Discord Canary",
227-
"DiscordDevelopment": "Discord Development"
227+
"DiscordDevelopment": "Discord Development",
228+
"About": "About",
229+
"Warn": "Warn"
228230
}

‎MultiRPC/UI/App.axaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<Color x:Key="Orange">#FFEEAD37</Color>
2222
<Color x:Key="Green">#FF43B581</Color>
2323

24+
<SolidColorBrush x:Key="GreenBrush" Color="{DynamicResource Green}" />
2425
<SolidColorBrush x:Key="RedBrush" Color="{DynamicResource Red}" />
2526
<SolidColorBrush x:Key="PurpleBrush" Color="{DynamicResource Purple}" />
2627

‎MultiRPC/UI/MainPage.axaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,6 @@
4141
</Grid>
4242

4343
<overlays:DiscordCheckOverlay Grid.ColumnSpan="2" Grid.Column="0" />
44+
<overlays:NetworkStatusOverlay VerticalAlignment="Bottom" Grid.ColumnSpan="2" Grid.Column="0" />
4445
</Grid>
4546
</UserControl>

‎MultiRPC/UI/MainWindow.axaml.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Avalonia.Controls;
66
using MultiRPC.Setting;
77
using MultiRPC.Setting.Settings;
8+
using MultiRPC.Utils;
89

910
namespace MultiRPC.UI
1011
{
@@ -93,16 +94,19 @@ private void InitializeExtra()
9394
{
9495
lang.TextObservable.Subscribe(s =>
9596
{
96-
txtTitle.Text = s + " - " + titlePage.Title.Text;
97+
txtTitle.Text = s + " - " + titlePage.Title.Text + (AdminUtil.IsAdmin ? " (Administrator)" : "");
9798
});
9899
titlePage.Title.TextObservable.Subscribe(s =>
99100
{
100-
txtTitle.Text = lang.Text + " - " + s;
101+
txtTitle.Text = lang.Text + " - " + s + (AdminUtil.IsAdmin ? " (Administrator)" : "");
101102
});
102103
}
103104
else
104105
{
105-
txtTitle.DataContext = lang;
106+
lang.TextObservable.Subscribe(s =>
107+
{
108+
txtTitle.Text = s + (AdminUtil.IsAdmin ? " (Administrator)" : "");
109+
});
106110
}
107111

108112
eabTitleBar.PointerPressed += (sender, args) => BeginMoveDrag(args);

‎MultiRPC/UI/Overlays/NetworkStatusOverlay.axaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<UserControl xmlns="https://github.com/avaloniaui"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
6+
x:Class="MultiRPC.UI.Overlays.NetworkStatusOverlay" Height="0">
7+
<TextBlock Name="tblInternetConnectivity" HorizontalAlignment="Center" Margin="0,5" />
8+
</UserControl>

‎MultiRPC/UI/Overlays/NetworkStatusOverlay.axaml.cs‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
using System;
2+
using System.Net.NetworkInformation;
3+
using System.Threading.Tasks;
4+
using Avalonia;
5+
using Avalonia.Controls;
6+
using Avalonia.Data;
7+
using Avalonia.Markup.Xaml;
8+
using Avalonia.Media;
9+
using MultiRPC.Extensions;
10+
using MultiRPC.Utils;
11+
12+
namespace MultiRPC.UI.Overlays
13+
{
14+
public partial class NetworkStatusOverlay : UserControl
15+
{
16+
public NetworkStatusOverlay()
17+
{
18+
InitializeComponent();
19+
NetworkChange.NetworkAddressChanged += AddressChangedCallback;
20+
AddressChangedCallback(null, EventArgs.Empty);
21+
}
22+
23+
private void AddressChangedCallback(object? sender, EventArgs e)
24+
{
25+
if (NetworkUtil.NetworkIsAvailable())
26+
{
27+
this.RunUILogic(async () =>
28+
{
29+
this.Background = (SolidColorBrush)Application.Current.Resources["GreenBrush"]!;
30+
tblInternetConnectivity.Text = Language.GetText("InternetBack") + "!!";
31+
await Task.Delay(3000);
32+
this.Height = 0;
33+
});
34+
return;
35+
}
36+
37+
this.RunUILogic(() =>
38+
{
39+
this.Height = double.NaN;
40+
tblInternetConnectivity.Text = Language.GetText("InternetLost") + "!!";
41+
this.Background = (SolidColorBrush)Application.Current.Resources["RedBrush"]!;
42+
});
43+
}
44+
}
45+
}

‎MultiRPC/UI/Pages/Settings/AboutSettingsTab.axaml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<UserControl xmlns="https://github.com/avaloniaui"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:settings="clr-namespace:MultiRPC.UI.Pages.Settings"
6+
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
7+
x:Class="MultiRPC.UI.Pages.Settings.AboutSettingsTab">
8+
<UserControl.Styles>
9+
<Style Selector="TextBlock.title">
10+
<Setter Property="FontWeight" Value="Bold" />
11+
</Style>
12+
</UserControl.Styles>
13+
<Grid ColumnDefinitions="Auto *" RowDefinitions="Auto Auto Auto" Margin="0,0,0,10">
14+
<StackPanel Orientation="Horizontal">
15+
<Svg Height="92" Width="92" Path="/Assets/Logo.svg" />
16+
<StackPanel Spacing="6" Margin="7,0,0,0">
17+
<TextBlock Text="MultiRPC - V7" Classes="title" />
18+
<TextBlock Text="Made by: Fluxpoint Dev" />
19+
<StackPanel Orientation="Horizontal" Spacing="7">
20+
<Svg Height="27" Width="27" Path="/Assets/Icons/Github.svg" />
21+
<Svg Height="27" Width="27" Path="/Assets/Icons/Fluxpoint.svg" />
22+
<Svg Height="27" Width="27" Path="/Assets/Icons/Browser.svg" />
23+
<Border Height="27" Width="27" CornerRadius="27" Background="{DynamicResource Purple}">
24+
<Svg Height="19" Width="19" Path="/Assets/Icons/Discord.svg" />
25+
</Border>
26+
</StackPanel>
27+
</StackPanel>
28+
</StackPanel>
29+
30+
<StackPanel Grid.Row="1" Margin="0,10">
31+
<TextBlock Text="Discord" Classes="title" />
32+
<StackPanel Orientation="Horizontal">
33+
<Border BorderThickness="2" BorderBrush="Black" Background="Green" Width="37" Height="37" CornerRadius="37" />
34+
<TextBlock Text="Online" VerticalAlignment="Center" Margin="7,0,0,0" />
35+
</StackPanel>
36+
</StackPanel>
37+
38+
<StackPanel Grid.Row="2" Spacing="10">
39+
<TextBlock Text="Donations" Classes="title" HorizontalAlignment="Left" />
40+
<StackPanel Orientation="Horizontal" Spacing="10" HorizontalAlignment="Left">
41+
<Button Content="Paypal (min $2)" />
42+
<Button Content="Patreon (Monthly)" />
43+
</StackPanel>
44+
<Border MaxWidth="280" CornerRadius="9" Background="{DynamicResource ThemeAccentBrush}">
45+
<TextBlock Margin="7" TextWrapping="Wrap" x:Name="tblDonationInfo" />
46+
</Border>
47+
</StackPanel>
48+
49+
<Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Column="1" Grid.Row="2"
50+
Margin="10,0,0,0" RowDefinitions="* *" ColumnDefinitions="* *">
51+
<Button Content="Admin Mode" Width="115" Height="36" Classes="purple" />
52+
<Button Content="Changelog" Grid.Row="1" Width="115" Height="36" Classes="purple" />
53+
<Button Content="Check for updates" Grid.Column="1" Grid.RowSpan="2" Classes="purple"
54+
VerticalAlignment="Stretch" Height="72" Width="90" />
55+
</Grid>
56+
</Grid>
57+
</UserControl>

0 commit comments

Comments
 (0)