Skip to content
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

[New Feature] Zenless Zone Zero Game Setings #532

Merged
merged 46 commits into from
Jul 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
429cb92
Initial implementation for ZZZ GSP Backend
bagusnl Jul 3, 2024
a7016ac
Preliminary frontend for Zenless Settings
bagusnl Jul 3, 2024
ca169b6
Fix crashes on the initial ZZZ settings implementation
neon-nyan Jul 3, 2024
830b83d
Merge remote-tracking branch 'origin/main' into zzz-settings
bagusnl Jul 3, 2024
c6c7b69
Some fixes
bagusnl Jul 3, 2024
bc9bd65
Fixed recursive check
bagusnl Jul 3, 2024
965cd99
Fix decode/encode
shatyuka Jul 4, 2024
1f03aa8
Adjust proper deserialization on ZZZ's GeneralData
neon-nyan Jul 8, 2024
a20a3a9
Add enums
bagusnl Jul 8, 2024
b947fa1
Implement Node to Value APIs
neon-nyan Jul 8, 2024
d048271
Fix bool casting
bagusnl Jul 8, 2024
93c46f0
Add more properties to GeneralData
bagusnl Jul 8, 2024
460f61b
forgor to set default values
bagusnl Jul 8, 2024
9c198c6
Rearrange and Finalize GeneralData type
bagusnl Jul 9, 2024
c98931f
Ensure the non existed node to use default values
neon-nyan Jul 9, 2024
1e89356
Oopsie, forgor to remove test codes
neon-nyan Jul 9, 2024
cbc1242
Fix crash while saving values
neon-nyan Jul 9, 2024
982367a
Fix potential JSON string buffer went blank under Utf8JsonWriter
neon-nyan Jul 9, 2024
0917dcd
Implement resolution selector
bagusnl Jul 9, 2024
b1a09ac
Do not modify source acH
bagusnl Jul 9, 2024
64bd009
Fix log issues
neon-nyan Jul 10, 2024
18154bf
Implement ResolutionIndex property
neon-nyan Jul 10, 2024
e75b384
Properly switch values based on fullscreen state
neon-nyan Jul 10, 2024
d7e5977
Merge branch 'main' into zzz-settings
bagusnl Jul 11, 2024
f7cf545
Only append screen cmd when using custom res
bagusnl Jul 11, 2024
5e1da85
Add docs comments
bagusnl Jul 11, 2024
86e6957
Finalize ui backend
bagusnl Jul 11, 2024
1aa0133
Frontend!
bagusnl Jul 12, 2024
30cba60
Fix preset behavior
bagusnl Jul 12, 2024
0fb49bf
Implement audio control settings
bagusnl Jul 12, 2024
4836912
Adjust margins and style
bagusnl Jul 12, 2024
0772934
Localization
bagusnl Jul 12, 2024
a8e1cd8
CodeQA
bagusnl Jul 12, 2024
e8bf71e
CodeQA pt 2
bagusnl Jul 13, 2024
3769465
Remove method to disable slider popup
bagusnl Jul 13, 2024
de2e511
Avoid RequiresUnreferencedCode for JsonNode creation
neon-nyan Jul 13, 2024
39e0a9f
Kod Ki Ei :facepalm:
neon-nyan Jul 13, 2024
0fed906
Avoid re-init on creating default values
neon-nyan Jul 13, 2024
785e9dc
Move IGameSettingsValueMagic<T> to base class
neon-nyan Jul 13, 2024
fc9f086
Use ``JsonNode.DeepEquals`` to compare values
neon-nyan Jul 13, 2024
e2010db
Fix Borderless checkbox not disabled if fullscreen is used
neon-nyan Jul 13, 2024
f5cf481
Fix QA
neon-nyan Jul 13, 2024
cc3e513
Fix build
neon-nyan Jul 13, 2024
6291521
Adding more localization strings
neon-nyan Jul 13, 2024
3f6dc10
Fix missing in-code localization
neon-nyan Jul 13, 2024
c55c27b
Remove TODO comments
neon-nyan Jul 13, 2024
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
1 change: 1 addition & 0 deletions CollapseLauncher.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,5 @@
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Shcore/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=zenless/@EntryIndexedValue">True</s:Boolean>
</wpf:ResourceDictionary>
9 changes: 5 additions & 4 deletions CollapseLauncher/Classes/EventsManagement/EventsHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
using Windows.Foundation;
using Windows.Networking.Connectivity;
using static CollapseLauncher.InnerLauncherConfig;
using static Hi3Helper.Locale;
using static Hi3Helper.Shared.Region.LauncherConfig;
// ReSharper disable CheckNamespace
// ReSharper disable AssignNullToNotNullAttribute

namespace CollapseLauncher
{
Expand Down Expand Up @@ -302,11 +303,11 @@ internal class BackgroundImgChangerInvoker
{
public static event EventHandler<BackgroundImgProperty> ImgEvent;
public static event EventHandler<bool> IsImageHide;
BackgroundImgProperty property;

public void ChangeBackground(string ImgPath, Action ActionAfterLoaded,
bool IsCustom, bool IsForceRecreateCache = false, bool IsRequestInit = false)
bool IsCustom, bool IsForceRecreateCache = false, bool IsRequestInit = false)
{
ImgEvent?.Invoke(this, property = new BackgroundImgProperty(ImgPath, IsCustom, IsForceRecreateCache, IsRequestInit, ActionAfterLoaded));
ImgEvent?.Invoke(this, new BackgroundImgProperty(ImgPath, IsCustom, IsForceRecreateCache, IsRequestInit, ActionAfterLoaded));
}

public void ToggleBackground(bool Hide) => IsImageHide?.Invoke(this, Hide);
Expand Down
1 change: 0 additions & 1 deletion CollapseLauncher/Classes/FileDialogCOM/Interfaces.cs
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ internal partial interface IFileSaveDialog
[GeneratedComInterface]
internal partial interface IFileDialogEvents; // This dialog is no longer being used

[ComImport]
[Guid(IIDGuid.IShellItem)]
[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
[GeneratedComInterface]
Expand Down
Loading
Loading