Skip to content

feat(RPC): Add StatusDisplay Option Integration #5584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Bloxstrap/Bloxstrap.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<ItemGroup>
<PackageReference Include="AvalonEdit" Version="6.3.0.90" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
<PackageReference Include="DiscordRichPresence" Version="1.4.1.37" />
<PackageReference Include="Markdig" Version="0.40.0" />
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.183">
<!--<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
Expand Down
19 changes: 19 additions & 0 deletions Bloxstrap/Enums/DiscordRPCStatusDisplay.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using DiscordRPC;

namespace Bloxstrap.Enums
{
/// <summary>
/// Represents the display options for Discord RPC status.
/// </summary>
/// <remarks>
/// This is basically just a copy of the enum from the DiscordRPC library but with attributes added for the UI
/// </remarks>
public enum DiscordRPCStatusDisplay
{
[EnumName(FromTranslation = "Enums.DiscordRPCStatusDisplay.Name")]
Name = StatusDisplayType.Name,
[EnumName(FromTranslation = "Enums.DiscordRPCStatusDisplay.Details")]
Details = StatusDisplayType.Details,
// State also exists, but I don't think it makes sense to use it here
}
}
1 change: 1 addition & 0 deletions Bloxstrap/Integrations/DiscordRichPresence.cs
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@ public async Task<bool> SetCurrentGame()
_currentPresence = new DiscordRPC.RichPresence
{
Details = universeName,
StatusDisplay = (StatusDisplayType)App.Settings.Prop.RichPresenceStatusDisplayType,
State = status,
Timestamps = new Timestamps { Start = timeStarted.ToUniversalTime() },
Buttons = GetButtons(),
Expand Down
1 change: 1 addition & 0 deletions Bloxstrap/Models/Persistable/Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public class Settings
public bool UseDiscordRichPresence { get; set; } = true;
public bool HideRPCButtons { get; set; } = true;
public bool ShowAccountOnRichPresence { get; set; } = false;
public DiscordRPCStatusDisplay RichPresenceStatusDisplayType { get; set; } = DiscordRPCStatusDisplay.Name;
public bool ShowServerDetails { get; set; } = false;
public ObservableCollection<CustomIntegration> CustomIntegrations { get; set; } = new();

Expand Down
37 changes: 36 additions & 1 deletion Bloxstrap/Resources/Strings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Bloxstrap/Resources/Strings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,12 @@ If not, then please report this exception through a [GitHub issue]({1}) along wi
<data name="Enums.Theme.Light" xml:space="preserve">
<value>Light</value>
</data>
<data name = "Enums.DiscordRPCStatusDisplay.Name" xml:space="preserve">
<value>Name (Playing Roblox)</value>
</data>
<data name = "Enums.DiscordRPCStatusDisplay.Details" xml:space="preserve">
<value>Details (Playing Grow A Garden)</value>
</data>
<data name="InstallChecker.Updated" xml:space="preserve">
<value>Bloxstrap has been upgraded to v{0}</value>
</data>
Expand Down Expand Up @@ -686,6 +692,12 @@ Selecting 'No' will ignore this warning and continue installation.</value>
<data name="Menu.Integrations.ShowAccountOnProfile.Title" xml:space="preserve">
<value>Show Roblox account</value>
</data>
<data name="Menu.Integrations.StatusDisplayText.Title" xml:space="preserve">
<value>Status display text</value>
</data>
<data name="Menu.Integrations.StatusDisplayText.Description" xml:space="preserve">
<value>Select what to display on your Discord profile status.</value>
</data>
<data name="Menu.Integrations.Custom.AppLocation" xml:space="preserve">
<value>Application Location</value>
</data>
Expand Down
12 changes: 12 additions & 0 deletions Bloxstrap/UI/Elements/Settings/Pages/IntegrationsPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,18 @@
IsEnabled="{Binding InnerContent.IsChecked, ElementName=DiscordActivityOption, Mode=OneWay}">
<ui:ToggleSwitch IsChecked="{Binding DiscordAccountOnProfile, Mode=TwoWay}" />
</controls:OptionControl>

<controls:OptionControl
Header="{x:Static resources:Strings.Menu_Integrations_StatusDisplayText_Title}"
Description="{x:Static resources:Strings.Menu_Integrations_StatusDisplayText_Description}">
<ComboBox Width="200" Padding="10,5,10,5" ItemsSource="{Binding DiscordActivityStatusDisplayTypes, Mode=OneTime}" Text="{Binding DiscordActivityStatusDisplayType, Mode=TwoWay}">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=., Converter={StaticResource EnumNameConverter}}" />
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</controls:OptionControl>

<TextBlock Text="{x:Static resources:Strings.Common_Miscellaneous}" FontSize="20" FontWeight="Medium" Margin="0,16,0,0" />

Expand Down
9 changes: 9 additions & 0 deletions Bloxstrap/UI/ViewModels/Settings/IntegrationsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,15 @@ public bool DiscordAccountOnProfile
set => App.Settings.Prop.ShowAccountOnRichPresence = value;
}

public IEnumerable<DiscordRPCStatusDisplay> DiscordActivityStatusDisplayTypes { get; } =
Enum.GetValues(typeof(DiscordRPCStatusDisplay))
.Cast<DiscordRPCStatusDisplay>();
public DiscordRPCStatusDisplay DiscordActivityStatusDisplayType
{
get => App.Settings.Prop.RichPresenceStatusDisplayType;
set => App.Settings.Prop.RichPresenceStatusDisplayType = value;
}

public bool DisableAppPatchEnabled
{
get => App.Settings.Prop.UseDisableAppPatch;
Expand Down