Skip to content

Commit 4d7c3b9

Browse files
tsukiforgetsukiforge
committed
Update Ui & Optimize New Desain
1 parent 5773f38 commit 4d7c3b9

16 files changed

Lines changed: 117 additions & 555 deletions

File tree

‎Bloxstrap/App.xaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,24 @@
1616
</ResourceDictionary.MergedDictionaries>
1717

1818
<FontFamily x:Key="Rubik">pack://application:,,,/Resources/Fonts/#Rubik Light</FontFamily>
19+
<FontFamily x:Key="InterRegular">pack://application:,,,/Resources/Fonts/#Inter</FontFamily>
20+
<FontFamily x:Key="InterMedium">pack://application:,,,/Resources/Fonts/#Inter Medium</FontFamily>
21+
<FontFamily x:Key="InterSemiBold">pack://application:,,,/Resources/Fonts/#Inter SemiBold</FontFamily>
22+
<FontFamily x:Key="InterLight">pack://application:,,,/Resources/Fonts/#Inter Light</FontFamily>
23+
24+
<!-- Global font override — Inter for all text elements -->
25+
<Style TargetType="TextBlock">
26+
<Setter Property="FontFamily" Value="{StaticResource InterRegular}" />
27+
</Style>
28+
<Style TargetType="TextBox">
29+
<Setter Property="FontFamily" Value="{StaticResource InterRegular}" />
30+
</Style>
31+
<Style TargetType="Button">
32+
<Setter Property="FontFamily" Value="{StaticResource InterMedium}" />
33+
</Style>
34+
<Style TargetType="ComboBox">
35+
<Setter Property="FontFamily" Value="{StaticResource InterRegular}" />
36+
</Style>
1937

2038
<Style TargetType="Hyperlink">
2139
<Style.Triggers>

‎Bloxstrap/Bloxstrap.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,18 @@
2020

2121
<ItemGroup>
2222
<Resource Include="Bloxstrap.ico" />
23+
<Resource Include="BoneFish.ico" />
2324
<Resource Include="Resources\BootstrapperStyles\TwentyFiveDialog\PlayerLogo.png" />
2425
<Resource Include="Resources\BootstrapperStyles\TwentyFiveDialog\Roblox.png" />
2526
<Resource Include="Resources\BootstrapperStyles\TwentyFiveDialog\Studio.png" />
2627
<Resource Include="Resources\BootstrapperStyles\TwentyFiveDialog\StudioLogo.png" />
2728
<Resource Include="Resources\LightEditor.xshd" />
2829
<Resource Include="Resources\Fonts\NotoSansThai-VariableFont_wdth,wght.ttf" />
2930
<Resource Include="Resources\Fonts\Rubik-VariableFont_wght.ttf" />
31+
<Resource Include="Resources\Fonts\Inter-Regular.ttf" />
32+
<Resource Include="Resources\Fonts\Inter-Medium.ttf" />
33+
<Resource Include="Resources\Fonts\Inter-SemiBold.ttf" />
34+
<Resource Include="Resources\Fonts\Inter-Light.ttf" />
3035
<Resource Include="Resources\BootstrapperStyles\ByfronDialog\ByfronLogoDark.jpg" />
3136
<Resource Include="Resources\BootstrapperStyles\ByfronDialog\ByfronLogoLight.jpg" />
3237
<Resource Include="Resources\BootstrapperStyles\ByfronDialog\Matt.png" />
@@ -63,6 +68,7 @@
6368
<None Include="Resources\Wallpapers\wallpapers.jpg" CopyToOutputDirectory="PreserveNewest" />
6469
<None Include="Resources\Wallpapers\wallpapersC.jpg" CopyToOutputDirectory="PreserveNewest" />
6570
<None Include="Resources\Wallpapers\wallpapersQ.jpg" CopyToOutputDirectory="PreserveNewest" />
71+
<None Include="Resources\Wallpapers\wallpapersE.jpg" CopyToOutputDirectory="PreserveNewest" />
6672
</ItemGroup>
6773

6874
<ItemGroup>

‎Bloxstrap/BoneFish.ico‎

3.28 KB
Binary file not shown.

‎Bloxstrap/Integrations/AppBackgroundService.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public enum BackgroundType
1919
{
2020
Default = 0,
2121
Cool = 1,
22-
Quality = 2
22+
Quality = 2,
23+
Extra = 3
2324
}
2425

2526
/// <summary>
@@ -36,6 +37,7 @@ public enum BackgroundType
3637
BackgroundType.Default => Path.Combine(wallpaperPath, "wallpapers.jpg"),
3738
BackgroundType.Cool => Path.Combine(wallpaperPath, "wallpapersC.jpg"),
3839
BackgroundType.Quality => Path.Combine(wallpaperPath, "wallpapersQ.jpg"),
40+
BackgroundType.Extra => Path.Combine(wallpaperPath, "wallpapersE.jpg"),
3941
_ => Path.Combine(wallpaperPath, "wallpapers.jpg")
4042
};
4143

@@ -106,6 +108,7 @@ public static bool ValidateBackgroundFiles()
106108
BackgroundType.Default => Path.Combine(wallpaperPath, "wallpapers.jpg"),
107109
BackgroundType.Cool => Path.Combine(wallpaperPath, "wallpapersC.jpg"),
108110
BackgroundType.Quality => Path.Combine(wallpaperPath, "wallpapersQ.jpg"),
111+
BackgroundType.Extra => Path.Combine(wallpaperPath, "wallpapersE.jpg"),
109112
_ => Path.Combine(wallpaperPath, "wallpapers.jpg")
110113
};
111114

‎Bloxstrap/Resources/Fonts/Inter-Light.ttf‎

399 KB
Binary file not shown.

‎Bloxstrap/Resources/Fonts/Inter-Medium.ttf‎

402 KB
Binary file not shown.

‎Bloxstrap/Resources/Fonts/Inter-Regular.ttf‎

398 KB
Binary file not shown.

‎Bloxstrap/Resources/Fonts/Inter-SemiBold.ttf‎

404 KB
Binary file not shown.

‎Bloxstrap/Resources/Wallpapers/wallpapersE.jpg‎

109 KB
Loading

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,17 @@
5656
<ui:NavigationItem Content="{x:Static resources:Strings.Menu_Integrations_Title}" PageType="{x:Type pages:IntegrationsPage}" Icon="Add28" Tag="integrations" />
5757
<ui:NavigationItem Content="{x:Static resources:Strings.Menu_Behaviour_Title}" PageType="{x:Type pages:BehaviourPage}" Icon="PlaySettings20" Tag="bootstrapper" />
5858
<ui:NavigationItem Content="{x:Static resources:Strings.Common_Deployment}" PageType="{x:Type pages:ChannelPage}" Icon="CloudArchive20" Tag="channel" />
59+
60+
<!-- Separator: Kustomisasi -->
61+
<ui:NavigationSeparator />
5962
<ui:NavigationItem Content="{x:Static resources:Strings.Menu_Mods_Title}" PageType="{x:Type pages:ModsPage}" Icon="WrenchScrewdriver20" Tag="mods" />
60-
<ui:NavigationItem x:Name="fastflags" Content="{x:Static resources:Strings.Menu_FastFlags_Title}" PageType="{x:Type pages:FastFlagsPage}" Icon="Flag24" Tag="fastflags" />
61-
<ui:NavigationItem x:Name="gbs" Content="{x:Static resources:Strings.Common_GlobalSettings}" PageType="{x:Type pages:GlobalSettingsPage}" Icon="Settings20" Tag="gbseditor"/>
6263
<ui:NavigationItem Content="{x:Static resources:Strings.Menu_Appearance_Title}" PageType="{x:Type pages:AppearancePage}" Icon="PaintBrush24" Tag="appearance" />
6364
<ui:NavigationItem Content="{x:Static resources:Strings.Common_Shortcuts}" PageType="{x:Type pages:ShortcutsPage}" Icon="Apps28" Tag="shortcuts" />
65+
66+
<!-- Separator: Lanjutan -->
67+
<ui:NavigationSeparator />
68+
<ui:NavigationItem x:Name="fastflags" Content="{x:Static resources:Strings.Menu_FastFlags_Title}" PageType="{x:Type pages:FastFlagsPage}" Icon="Flag24" Tag="fastflags" />
69+
<ui:NavigationItem x:Name="gbs" Content="{x:Static resources:Strings.Common_GlobalSettings}" PageType="{x:Type pages:GlobalSettingsPage}" Icon="Settings20" Tag="gbseditor"/>
6470
<ui:NavigationItem Content="Experimental" PageType="{x:Type pages:ExperimentalPage}" Icon="Beaker24" Tag="experimental" />
6571

6672
<ui:NavigationItem Content="{x:Static resources:Strings.Menu_FastFlagEditor_Title}" PageType="{x:Type pages:FastFlagEditorPage}" Tag="fastflageditor" Visibility="Collapsed" />

0 commit comments

Comments
 (0)