Skip to content

Use V2 style for settings subsection #7

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.

Sign up for GitHub

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
CloneWith wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Use V2 style for settings subsection #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5dbc7a
Update dependency of osu.Game
CloneWith Apr 14, 2026
d5d7ce5
Use new settings style for AuthlibSettingsSubsection
CloneWith Apr 14, 2026
e4e8019
Change to SettingsButtonV2 for save button
CloneWith Apr 14, 2026
f15bac5
Add warnings for advanced settings
CloneWith Apr 14, 2026
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
195 changes: 115 additions & 80 deletions osu.Game.Rulesets.AuthlibInjection/UI/AuthlibSettingsSubsection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,48 @@
using Newtonsoft.Json;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Localisation;
using osu.Framework.Platform;
using osu.Game.Graphics.UserInterfaceV2;
using osu.Game.Overlays;
using osu.Game.Overlays.Settings;
using osu.Game.Rulesets.AuthlibInjection.Configuration;
using osu.Game.Rulesets.AuthlibInjection.Extensions;
using osu.Game.Rulesets.AuthlibInjection.Notifications;
using osu.Game.Rulesets.AuthlibInjection.Patches;
using osuTK;

namespace osu.Game.Rulesets.AuthlibInjection.UI;

public partial class AuthlibSettingsSubsection(Ruleset ruleset) : RulesetSettingsSubsection(ruleset)
{
private const int delay = 1500;
private readonly Ruleset ruleset = ruleset;
private AuthlibRulesetConfig authlibRulesetConfig = new();
private AuthlibRulesetConfig authlibRulesetConfig = new AuthlibRulesetConfig();

// Considered for distinction, batch disabling
// ReSharper disable InconsistentNaming
private SettingsCheckbox DisableSentryLogging = null!;
private SettingsCheckbox NonG0V0Server = null!;
private FormCheckBox disableSentryLogging = null!;
private FormCheckBox nonG0V0Server = null!;

private SettingsTextBox ApiUrl = null!;
private FormTextBox apiUrl = null!;
private FormTextBox beatmapSubmissionServiceUrl = null!;

private SettingsTextBox BeatmapSubmissionServiceUrl = null!;
private FormTextBox clientId = null!;
private FormTextBox clientSecret = null!;

private SettingsTextBox ClientId = null!;
private FormTextBox metadataUrl = null!;
private FormTextBox multiplayerUrl = null!;
private FormTextBox spectatorUrl = null!;
private FormTextBox websiteUrl = null!;

private SettingsTextBox ClientSecret = null!;

private SettingsTextBox MetadataUrl = null!;

private SettingsTextBox MultiplayerUrl = null!;

private SettingsTextBox SpectatorUrl = null!;

private SettingsTextBox WebsiteUrl = null!;
// ReSharper restore InconsistentNaming
private FillFlowContainer advancedSettingsFlow = null!;

private string filePath = "";

private readonly BindableBool showAdvancedSettings = new BindableBool();
private readonly Bindable<SettingsNote.Data> advancedSettingsWarning = new Bindable<SettingsNote.Data>();

private AuthlibRulesetConfigManager config => (AuthlibRulesetConfigManager)Config;

protected override LocalisableString Header => ruleset.Description;
Expand All @@ -55,6 +56,10 @@ public partial class AuthlibSettingsSubsection(Ruleset ruleset) : RulesetSetting
[BackgroundDependencyLoader]
private void load(OsuGame game, Storage storage)
{
// Added for smooth transition of advanced settings section
AutoSizeDuration = 300;
AutoSizeEasing = Easing.OutQuint;

filePath = storage.GetFullPath(AuthlibRulesetConfig.CONFIG_FILE_NAME);

if (File.Exists(filePath))
Expand All @@ -66,65 +71,95 @@ private void load(OsuGame game, Storage storage)

Children =
[
ApiUrl = new SettingsTextBox()
new SettingsItemV2(apiUrl = new FormTextBox
{
LabelText = "API Url",
Current = config.GetBindable<string>(AuthlibRulesetSettings.ApiUrl)
},
WebsiteUrl = new SettingsTextBox()
{
LabelText = "Website Url",
Current = config.GetBindable<string>(AuthlibRulesetSettings.WebsiteUrl)
},
ClientId = new SettingsTextBox()
Caption = "API Url",
Current = config.GetBindable<string>(AuthlibRulesetSettings.ApiUrl),
}),
new SettingsItemV2(websiteUrl = new FormTextBox
{
LabelText = "Client ID",
Current = config.GetBindable<string>(AuthlibRulesetSettings.ClientId)
},
ClientSecret = new SettingsTextBox()
Caption = "Website Url",
Current = config.GetBindable<string>(AuthlibRulesetSettings.WebsiteUrl),
}),
new SettingsItemV2(new FormCheckBox
{
LabelText = "Client Secret",
Current = config.GetBindable<string>(AuthlibRulesetSettings.ClientSecret)
},
SpectatorUrl = new SettingsTextBox()
Caption = "Show Advanced",
Current = showAdvancedSettings,
})
{
LabelText = "Spectator Url",
Current = config.GetBindable<string>(AuthlibRulesetSettings.SpectatorUrl)
Note =
{
BindTarget = advancedSettingsWarning,
},
},
MultiplayerUrl = new SettingsTextBox()
advancedSettingsFlow = new FillFlowContainer
{
LabelText = "Multiplayer Url",
Current = config.GetBindable<string>(AuthlibRulesetSettings.MultiplayerUrl)
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Spacing = new Vector2(5),
Alpha = 0,
Children =
[
new SettingsItemV2(clientId = new FormTextBox
{
Caption = "Client ID",
Current = config.GetBindable<string>(AuthlibRulesetSettings.ClientId),
}),
new SettingsItemV2(clientSecret = new FormTextBox
{
Caption = "Client Secret",
Current = config.GetBindable<string>(AuthlibRulesetSettings.ClientSecret),
}),
new SettingsItemV2(spectatorUrl = new FormTextBox
{
Caption = "Spectator Url",
Current = config.GetBindable<string>(AuthlibRulesetSettings.SpectatorUrl),
}),
new SettingsItemV2(multiplayerUrl = new FormTextBox
{
Caption = "Multiplayer Url",
Current = config.GetBindable<string>(AuthlibRulesetSettings.MultiplayerUrl)
}),
new SettingsItemV2(metadataUrl = new FormTextBox
{
Caption = "Metadata Url",
Current = config.GetBindable<string>(AuthlibRulesetSettings.MetadataUrl),
}),
new SettingsItemV2(beatmapSubmissionServiceUrl = new FormTextBox
{
Caption = "Beatmap Submission Service Url",
Current = config.GetBindable<string>(AuthlibRulesetSettings.BeatmapSubmissionServiceUrl),
}),
new SettingsItemV2(nonG0V0Server = new FormCheckBox
{
Caption = "Is non-g0v0-server",
HintText = "Whether the server is a GooGuTeam/g0v0-server instance. You can view https://<api-url>/docs to identify",
Current = config.GetBindable<bool>(AuthlibRulesetSettings.NonG0V0Server),
}),
new SettingsItemV2(disableSentryLogging = new FormCheckBox
{
Caption = "Disable Sentry Logger",
HintText = "Stop sending telemetry error data to the osu! dev team.",
Current = config.GetBindable<bool>(AuthlibRulesetSettings.DisableSentryLogger),
}),
],
},
MetadataUrl = new SettingsTextBox()
{
LabelText = "Metadata Url",
Current = config.GetBindable<string>(AuthlibRulesetSettings.MetadataUrl)
},
BeatmapSubmissionServiceUrl = new SettingsTextBox()
{
LabelText = "Beatmap Submission Service Url",
Current = config.GetBindable<string>(AuthlibRulesetSettings.BeatmapSubmissionServiceUrl)
},
DisableSentryLogging = new SettingsCheckbox()
{
LabelText = "Disable Sentry Logger",
TooltipText = "Stop sending telemetry error data to the osu! dev team.",
Current = config.GetBindable<bool>(AuthlibRulesetSettings.DisableSentryLogger)
},
NonG0V0Server = new SettingsCheckbox()
{
LabelText = "Is non-g0v0-server",
TooltipText = "Whether the server is a GooGuTeam/g0v0-server instance. You can view https://<api-url>/docs to identify",
Current = config.GetBindable<bool>(AuthlibRulesetSettings.NonG0V0Server),
},
new SettingsButton()
new SettingsButtonV2
{
Text = "Save Changes",
Action = onSaveChanges
Action = onSaveChanges,
},
];
DisableSentryLogging.Current.BindValueChanged(e => onSentryOptOutChanged(e, game), true);

showAdvancedSettings.BindValueChanged(onAdvancedVisibilityChanged);
disableSentryLogging.Current.BindValueChanged(e => onSentryOptOutChanged(e, game), true);
}

private void onAdvancedVisibilityChanged(ValueChangedEvent<bool> e)
{
advancedSettingsFlow.FadeTo(e.NewValue ? 1 : 0, 300, Easing.OutQuint);
advancedSettingsWarning.Value = e.NewValue ? new SettingsNote.Data("These settings are not intended for normal gameplay. Use with caution!", SettingsNote.Type.Warning) : null;
}

private void onSentryOptOutChanged(ValueChangedEvent<bool> e, OsuGame game)
Expand All @@ -140,24 +175,24 @@ private void onSentryOptOutChanged(ValueChangedEvent<bool> e, OsuGame game)

private void onSaveChanges()
{
foreach (var settingsTextBox in (SettingsTextBox[])[ApiUrl, WebsiteUrl, SpectatorUrl, MultiplayerUrl, MetadataUrl, BeatmapSubmissionServiceUrl])
foreach (var textBox in (FormTextBox[])[apiUrl, websiteUrl, spectatorUrl, multiplayerUrl, metadataUrl, beatmapSubmissionServiceUrl])
{
if (!string.IsNullOrEmpty(settingsTextBox.Current.Value))
settingsTextBox.Current.Value = settingsTextBox.Current.Value.RemoveSuffix("/").AddHttpsProtocol();
if (!string.IsNullOrEmpty(textBox.Current.Value))
textBox.Current.Value = textBox.Current.Value.RemoveSuffix("/").AddHttpsProtocol();
}

authlibRulesetConfig = new AuthlibRulesetConfig()
authlibRulesetConfig = new AuthlibRulesetConfig
{
ApiUrl = ApiUrl.Current.Value,
WebsiteUrl = WebsiteUrl.Current.Value,
ClientId = ClientId.Current.Value,
ClientSecret = ClientSecret.Current.Value,
SpectatorUrl = SpectatorUrl.Current.Value,
MultiplayerUrl = MultiplayerUrl.Current.Value,
MetadataUrl = MetadataUrl.Current.Value,
BeatmapSubmissionServiceUrl = BeatmapSubmissionServiceUrl.Current.Value,
DisableSentryLogger = DisableSentryLogging.Current.Value,
NonG0V0Server = NonG0V0Server.Current.Value,
ApiUrl = apiUrl.Current.Value,
WebsiteUrl = websiteUrl.Current.Value,
ClientId = clientId.Current.Value,
ClientSecret = clientSecret.Current.Value,
SpectatorUrl = spectatorUrl.Current.Value,
MultiplayerUrl = multiplayerUrl.Current.Value,
MetadataUrl = metadataUrl.Current.Value,
BeatmapSubmissionServiceUrl = beatmapSubmissionServiceUrl.Current.Value,
DisableSentryLogger = disableSentryLogging.Current.Value,
NonG0V0Server = nonG0V0Server.Current.Value,
};

File.WriteAllText(
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.AuthlibInjection/osu.Game.Rulesets.AuthlibInjection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lib.Harmony" Version="2.4.1"/>
<PackageReference Include="ppy.osu.Game" Version="2025.618.0" />
<PackageReference Include="ppy.osu.Game" Version="2026.408.0" />
</ItemGroup>
</Project>