Skip to content

Commit 2eb84fe

Browse files
committed
remove and replace
1 parent 4bf7280 commit 2eb84fe

8 files changed

Lines changed: 54 additions & 13 deletions

File tree

Bloxstrap/App.xaml.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,11 @@ public partial class App : Application
2525
#endif
2626
public const string ProjectOwner = "RealMeddsam";
2727
public const string ProjectRepository = "RealMeddsam/Froststrap";
28+
public const string ProjectDownloadLink = "https://github.com/RealMeddsam/Froststrap/releases";
2829
public const string ProjectHelpLink = "https://github.com/bloxstraplabs/bloxstrap/wiki";
2930
public const string ProjectSupportLink = "https://github.com/RealMeddsam/Froststrap/issues/new";
3031
public const string ProjectRemoteDataLink = "https://raw.githubusercontent.com/RealMeddsam/config/refs/heads/main/Data.json";
3132

32-
// Reason for making it a remote data is because we plan on moving to org, and this way we can change the link without telling ppl to manually update, will remove when we eventually move
33-
public static string ProjectDownloadLink => RemoteData.Prop.ProjectDownloadLink ?? "https://github.com/RealMeddsam/Froststrap/releases";
34-
3533
public const string RobloxPlayerAppName = "RobloxPlayerBeta.exe";
3634
public const string RobloxStudioAppName = "RobloxStudioBeta.exe";
3735

Bloxstrap/Models/APIs/Config/RemoteDataBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ public class RemoteDataBase
2222
[JsonPropertyName("settingsPage")]
2323
public SettingsPageConfig SettingsPage { get; set; } = new();
2424

25-
[JsonPropertyName("projectDownloadLink")]
26-
public string ProjectDownloadLink { get; set; } = "https://github.com/RealMeddsam/Froststrap/releases";
27-
2825
[JsonPropertyName("mappings")]
2926
public Dictionary<string, string[]> Mappings { get; set; } = new Dictionary<string, string[]>();
3027

3128
[JsonPropertyName("communityMods")]
3229
public List<CommunityMod> CommunityMods { get; set; } = new List<CommunityMod>();
30+
31+
[JsonPropertyName("untilFishstrapReleases")]
32+
public bool UntilFishstrapReleases { get; set; } = false;
3333
}
3434
}

Bloxstrap/Resources/Strings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Bloxstrap/Resources/Strings.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2075,7 +2075,7 @@ You can no longer use Bloxshade with Froststrap.</value>
20752075
<value>Quality</value>
20762076
</data>
20772077
<data name="Menu.Integrations.PlaytimeCounter.Description" xml:space="preserve">
2078-
<value>Displays your total and game session playtime</value>
2078+
<value>Displays your total playtime and your session when your in a Game/Studio Place.</value>
20792079
</data>
20802080
<data name="Menu.Integrations.PlaytimeCounter.Title" xml:space="preserve">
20812081
<value>Playtime Counter</value>

Bloxstrap/UI/Elements/Settings/Pages/BootstrapperPage.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@
2323
<ui:ToggleSwitch IsChecked="{Binding ConfirmLaunches, Mode=TwoWay}" />
2424
</controls:OptionControl>
2525

26-
<!-- Keeping visibility collapsed until fishstrap releases or i get permission to add. -->
2726
<controls:OptionControl
2827
Header="{x:Static resources:Strings.Menu_Behaviour_AllowCookieAccess_Title}"
2928
Description="{Binding Source={x:Static resources:Strings.Menu_Behaviour_AllowCookieAccess_Description}, Converter={StaticResource StringFormatConverter}, ConverterParameter='https://github.com/fishstrap/fishstrap/wiki/Account-Access#what-will-fishstrap-access-with-your-account'}"
30-
Visibility="Collapsed">
29+
Visibility="{Binding UntilFishstrapReleases}">
3130
<StackPanel Orientation="Horizontal">
3231
<ui:SymbolIcon Symbol="Warning20" Margin="0,2,8,0" Foreground="Orange">
3332
<ui:SymbolIcon.Style>

Bloxstrap/UI/Elements/Settings/Pages/ChannelPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@
128128
<TextBlock Grid.Row="1" Grid.Column="0" Margin="0,0,16,8" VerticalAlignment="Center" Text="{x:Static resources:Strings.Common_VersionGuid}" />
129129
<TextBlock Grid.Row="1" Grid.Column="1" Foreground="{DynamicResource TextFillColorTertiaryBrush}" Text="{Binding ChannelDeployInfo.VersionGuid, Mode=OneWay}" />
130130

131-
<TextBlock Grid.Row="2" Grid.Column="0" Margin="0,0,16,8" VerticalAlignment="Center" Text="{x:Static resources:Strings.Common_Timestamp}" Visibility="Collapsed" />
132-
<TextBlock Grid.Row="2" Grid.Column="1" Foreground="{DynamicResource TextFillColorTertiaryBrush}" Text="{Binding ChannelDeployInfo.Timestamp, Mode=OneWay}" Visibility="Collapsed" />
131+
<TextBlock Grid.Row="2" Grid.Column="0" Margin="0,0,16,8" VerticalAlignment="Center" Text="{x:Static resources:Strings.Common_Timestamp}" Visibility="{Binding UntilFishstrapReleases}" />
132+
<TextBlock Grid.Row="2" Grid.Column="1" Foreground="{DynamicResource TextFillColorTertiaryBrush}" Text="{Binding ChannelDeployInfo.Timestamp, Mode=OneWay}" Visibility="{Binding UntilFishstrapReleases}" />
133133

134134
<Button Grid.Row="0" Grid.Column="2" HorizontalAlignment="Right" Content="{x:Static resources:Strings.Menu_ChannelChanger_AvailableChannels}" Click="OpenChannelListDialog_Click" />
135135

Bloxstrap/UI/ViewModels/Settings/BehaviourViewModel.cs

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Collections.ObjectModel;
22
using System.Windows;
3-
using Bloxstrap.Integrations;
43

54
namespace Bloxstrap.UI.ViewModels.Settings
65
{
@@ -12,6 +11,28 @@ public BehaviourViewModel()
1211
RobloxIcons.Add(new RobloxIconEntry { IconType = (RobloxIcon)entry });
1312

1413
App.Cookies.StateChanged += (object? _, CookieState state) => CookieLoadingFailed = state != CookieState.Success && state != CookieState.Unknown;
14+
15+
if (App.RemoteData.LoadedState == GenericTriState.Unknown)
16+
WaitForRemoteData();
17+
}
18+
19+
private async void WaitForRemoteData()
20+
{
21+
await App.RemoteData.WaitUntilDataFetched();
22+
OnPropertyChanged(nameof(UntilFishstrapReleases));
23+
}
24+
25+
public Visibility UntilFishstrapReleases
26+
{
27+
get
28+
{
29+
if (App.RemoteData?.Prop != null && App.RemoteData.Prop.UntilFishstrapReleases)
30+
{
31+
return Visibility.Visible;
32+
}
33+
34+
return Visibility.Collapsed;
35+
}
1536
}
1637

1738
public ObservableCollection<ProcessPriorityOption> ProcessPriorityOptions { get; } = new ObservableCollection<ProcessPriorityOption>(Enum.GetValues(typeof(ProcessPriorityOption)).Cast<ProcessPriorityOption>());

Bloxstrap/UI/ViewModels/Settings/ChannelViewModel.cs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Bloxstrap.RobloxInterfaces;
22
using System.ComponentModel;
3+
using System.Windows;
34

45
namespace Bloxstrap.UI.ViewModels.Settings
56
{
@@ -8,6 +9,28 @@ public class ChannelViewModel : NotifyPropertyChangedViewModel, INotifyPropertyC
89
public ChannelViewModel()
910
{
1011
Task.Run(() => LoadChannelDeployInfo(App.Settings.Prop.Channel));
12+
13+
if (App.RemoteData.LoadedState == GenericTriState.Unknown)
14+
WaitForRemoteData();
15+
}
16+
17+
private async void WaitForRemoteData()
18+
{
19+
await App.RemoteData.WaitUntilDataFetched();
20+
OnPropertyChanged(nameof(UntilFishstrapReleases));
21+
}
22+
23+
public Visibility UntilFishstrapReleases
24+
{
25+
get
26+
{
27+
if (App.RemoteData?.Prop != null && App.RemoteData.Prop.UntilFishstrapReleases)
28+
{
29+
return Visibility.Visible;
30+
}
31+
32+
return Visibility.Collapsed;
33+
}
1134
}
1235

1336
public bool UpdateCheckingEnabled

0 commit comments

Comments
 (0)