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.

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

Fix: Bixby not visible when hotkeys not supported #444

Merged
merged 1 commit into from
Feb 3, 2024
Merged

Fix: Bixby not visible when hotkeys not supported #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions GalaxyBudsClient/Interface/Pages/AdvancedPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</Border>
</Grid>
</Border>
<Border Grid.Row="4" x:Name="Hotkeys" Classes="RoundedBorderListItem BottomSpacer10">
<Border Grid.Row="4" x:Name="HotkeysBixby" Classes="RoundedBorderListItem BottomSpacer10">
<Grid ClipToBounds="True">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
Expand All @@ -65,7 +65,7 @@

<items:DetailListItem Grid.Row="0" Text="{DynamicResource adv_hotkey}"
Description="{DynamicResource adv_hotkey_desc}"
PointerPressed="Hotkeys_OnPointerPressed"/>
PointerPressed="Hotkeys_OnPointerPressed" x:Name="Hotkeys" />
<Separator Grid.Row="1" x:Name="BixbyRemapS" Margin="20,0,20,0" Background="{DynamicResource BorderSeparatorBrush}" />
<Border Grid.Row="2" x:Name="BixbyRemap">
<items:DetailListItem Text="{DynamicResource adv_bixby_remap}"
Expand Down
7 changes: 5 additions & 2 deletions GalaxyBudsClient/Interface/Pages/AdvancedPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,12 @@ private void InstanceOnExtendedStatusUpdate(object? sender, ExtendedStatusUpdate

public override void OnPageShown()
{
this.FindControl<Border>("Hotkeys").IsVisible = PlatformUtils.SupportsHotkeys;
this.FindControl<Border>("HotkeysBixby").IsVisible =
PlatformUtils.SupportsHotkeys || BluetoothImpl.Instance.DeviceSpec.Supports(IDeviceSpec.Feature.BixbyWakeup);
this.FindControl<Separator>("BixbyRemapS").IsVisible =
PlatformUtils.SupportsHotkeys && BluetoothImpl.Instance.DeviceSpec.Supports(IDeviceSpec.Feature.BixbyWakeup);
this.FindControl<DetailListItem>("Hotkeys").IsVisible = PlatformUtils.SupportsHotkeys;
this.FindControl<Border>("BixbyRemap").IsVisible = BluetoothImpl.Instance.DeviceSpec.Supports(IDeviceSpec.Feature.BixbyWakeup);
this.FindControl<Separator>("BixbyRemapS").IsVisible = BluetoothImpl.Instance.DeviceSpec.Supports(IDeviceSpec.Feature.BixbyWakeup);
this.FindControl<Separator>("SidetoneS").IsVisible = BluetoothImpl.Instance.DeviceSpec.Supports(IDeviceSpec.Feature.AmbientSidetone);
this.FindControl<Separator>("PassthroughS").IsVisible = BluetoothImpl.Instance.DeviceSpec.Supports(IDeviceSpec.Feature.AmbientPassthrough);
_sidetone.Parent!.IsVisible = BluetoothImpl.Instance.DeviceSpec.Supports(IDeviceSpec.Feature.AmbientSidetone);
Expand Down
Loading