Skip to content

Commit 7d078f3

Browse files
RealMeddsamRealMeddsam
committed
Starting from scratch
1 parent 7956ca3 commit 7d078f3

36 files changed

Lines changed: 65 additions & 1282 deletions

‎Bloxstrap/App.xaml.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,14 +179,14 @@ public static void WindowsBackdrop()
179179
});
180180
}
181181

182-
private static void ApplyBackdropToAllWindows(UIBackgroundType backdropType)
182+
private static void ApplyBackdropToAllWindows(WindowsBackdrops backdropType)
183183
{
184184
var wpfBackdrop = backdropType switch
185185
{
186-
UIBackgroundType.None => BackgroundType.None,
187-
UIBackgroundType.Mica => BackgroundType.Mica,
188-
UIBackgroundType.Acrylic => BackgroundType.Acrylic,
189-
UIBackgroundType.Aero => BackgroundType.Aero,
186+
WindowsBackdrops.None => BackgroundType.None,
187+
WindowsBackdrops.Mica => BackgroundType.Mica,
188+
WindowsBackdrops.Acrylic => BackgroundType.Acrylic,
189+
WindowsBackdrops.Aero => BackgroundType.Aero,
190190
_ => BackgroundType.None
191191
};
192192

‎Bloxstrap/Bloxstrap.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@
8686
<ItemGroup>
8787
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
8888
<PackageReference Include="DiscordRichPresence" Version="1.6.1.70" />
89-
<PackageReference Include="Markdig" Version="0.43.0" />
90-
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.250">
89+
<PackageReference Include="Markdig" Version="0.44.0" />
90+
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.257">
9191
<!--<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
9292
<PrivateAssets>all</PrivateAssets>
9393
</PackageReference>
9494
<PackageReference Include="AvalonEdit" Version="6.3.1.120" />
9595
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
96-
<PackageReference Include="PuppeteerExtraSharp" Version="3.0.1" />
96+
<PackageReference Include="PuppeteerExtraSharp" Version="3.0.2" />
9797
<PackageReference Include="PuppeteerSharp" Version="20.2.4" />
9898
<PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
9999
<PackageReference Include="SharpZipLib" Version="1.4.2" />

‎Bloxstrap/Enums/BackgroundImageStretchMode.cs‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Bloxstrap/Enums/CustomBackgroundMode.cs‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

Bloxstrap/Enums/UIBackgroundType.cs renamed to Bloxstrap/Enums/WindowsBackdrops.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Bloxstrap.Enums
22
{
3-
public enum UIBackgroundType
3+
public enum WindowsBackdrops
44
{
55
Mica,
66
Aero,

‎Bloxstrap/Models/GradientStopData.cs‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎Bloxstrap/Models/Persistable/Settings.cs‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,12 @@ public class Settings
6060
// Appearance Page
6161
public BootstrapperStyle BootstrapperStyle { get; set; } = BootstrapperStyle.CustomFluentDialog;
6262
public BootstrapperIcon BootstrapperIcon { get; set; } = BootstrapperIcon.IconBloxstrap;
63-
public UIBackgroundType SelectedBackdrop { get; set; } = UIBackgroundType.Mica;
63+
public WindowsBackdrops SelectedBackdrop { get; set; } = WindowsBackdrops.Mica;
6464
public string? SelectedCustomTheme { get; set; } = null;
6565
public string BootstrapperTitle { get; set; } = App.ProjectName;
6666
public string BootstrapperIconCustomLocation { get; set; } = "";
6767
public string DownloadingStringFormat { get; set; } = Strings.Bootstrapper_Status_Downloading + " {0} - {1}MB / {2}MB";
6868
public Theme Theme { get; set; } = Theme.Default;
69-
public List<GradientStopData> CustomGradientStops { get; set; } = new()
70-
{
71-
new GradientStopData { Offset = 0.0, Color = "#4D5560" },
72-
new GradientStopData { Offset = 0.5, Color = "#383F47" },
73-
new GradientStopData { Offset = 1.0, Color = "#252A30" }
74-
};
75-
public Point GradientStartPoint { get; set; } = new Point(1, 1);
76-
public Point GradientEndPoint { get; set; } = new Point(0, 0);
77-
public string ImageBackgroundPath { get; set; } = string.Empty;
78-
public CustomBackgroundMode BackgroundMode { get; set; } = CustomBackgroundMode.Gradient;
79-
public BackgroundImageStretchMode BackgroundImageStretch { get; set; } = BackgroundImageStretchMode.Fill;
80-
public double BlackOverlayOpacity { get; set; } = 0.2;
8169
public string? CustomFontPath { get; set; } = null;
8270
public List<string> NavigationOrder { get; set; } = new List<string>();
8371
public bool IsNavigationOrderLocked { get; set; } = true;

‎Bloxstrap/Models/ServerEntry.cs‎

Lines changed: 9 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,13 @@
1-
using System.ComponentModel;
2-
using System.Runtime.CompilerServices;
3-
using System.Windows.Input;
4-
5-
namespace Bloxstrap.Models
1+
namespace Bloxstrap.Models
62
{
7-
public class ServerEntry : INotifyPropertyChanged
3+
public class ServerEntry
84
{
9-
private int _number;
10-
private string _serverId = string.Empty;
11-
private string _players = string.Empty;
12-
private string _region = string.Empty;
13-
private int? _dataCenterId;
14-
private string _uptime = "Loading...";
15-
private ICommand? _joinCommand;
16-
17-
public int Number
18-
{
19-
get => _number;
20-
set { _number = value; OnPropertyChanged(); }
21-
}
22-
23-
public string ServerId
24-
{
25-
get => _serverId;
26-
set { _serverId = value; OnPropertyChanged(); }
27-
}
28-
29-
public string Players
30-
{
31-
get => _players;
32-
set { _players = value; OnPropertyChanged(); }
33-
}
34-
35-
public string Region
36-
{
37-
get => _region;
38-
set { _region = value; OnPropertyChanged(); }
39-
}
40-
41-
public int? DataCenterId
42-
{
43-
get => _dataCenterId;
44-
set { _dataCenterId = value; OnPropertyChanged(); }
45-
}
46-
47-
public string Uptime
48-
{
49-
get => _uptime;
50-
set { _uptime = value; OnPropertyChanged(); }
51-
}
52-
53-
public ICommand? JoinCommand
54-
{
55-
get => _joinCommand;
56-
set { _joinCommand = value; OnPropertyChanged(); }
57-
}
58-
59-
public event PropertyChangedEventHandler? PropertyChanged;
60-
protected void OnPropertyChanged([CallerMemberName] string? name = null)
61-
=> PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
5+
public int Number { get; set; }
6+
public string ServerId { get; set; } = null!;
7+
public string Players { get; set; } = null!;
8+
public string Region { get; set; } = null!;
9+
public int? DataCenterId { get; set; }
10+
public string Uptime { get; set; } = "Loading...";
11+
public System.Windows.Input.ICommand? JoinCommand { get; set; }
6212
}
6313
}

‎Bloxstrap/Models/Tweaks.cs‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Bloxstrap/UI/Elements/About/MainWindow.xaml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,12 @@
1616
ExtendsContentIntoTitleBar="True"
1717
WindowBackdropType="Mica"
1818
WindowStartupLocation="CenterScreen">
19-
<Grid>
20-
<Grid.Background>
21-
<DynamicResource ResourceKey="WindowBackgroundGradient" />
22-
</Grid.Background>
19+
<Grid Background="{DynamicResource WindowBackgroundGradient}">
2320
<Grid.RowDefinitions>
2421
<RowDefinition Height="Auto" />
2522
<RowDefinition Height="*" />
2623
</Grid.RowDefinitions>
2724

28-
<Grid x:Name="ImageBackgroundLayer" Panel.ZIndex="-1" Visibility="{Binding IsImageMode, Converter={StaticResource BooleanToVisibilityConverter}}" Grid.RowSpan="2">
29-
<Border Background="{DynamicResource WindowBackgroundImage}" />
30-
<Border Background="{DynamicResource WindowBackgroundBlackOverlay}" />
31-
</Grid>
32-
3325
<ui:TitleBar Padding="8" x:Name="RootTitleBar" Grid.Row="0" ForceShutdown="False" MinimizeToTray="False" UseSnapLayout="True" Title="{x:Static resources:Strings.About_Title}" Icon="pack://application:,,,/Bloxstrap.ico" />
3426

3527
<Grid x:Name="RootGrid" Grid.Row="1" Margin="12,12,0,0" Visibility="Visible">

0 commit comments

Comments
 (0)