Skip to content

Commit 109536e

Browse files
committed
combine player controls options into a settings expander
1 parent 86475a8 commit 109536e

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

Screenbox/Pages/SettingsPage.xaml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -401,19 +401,20 @@
401401
</ComboBox>
402402
</ctc:SettingsCard>
403403

404-
<ctc:SettingsCard
405-
Margin="{StaticResource SettingsCardMargin}"
406-
Header="{strings:Resources Key=SettingsShowControlsHeader}"
407-
HeaderIcon="{ui:FontIcon Glyph=&#xE75B;}">
408-
<ToggleSwitch x:Name="ShowControlsToggleSwitch" IsOn="{x:Bind ViewModel.PlayerShowControls, Mode=TwoWay}" />
409-
</ctc:SettingsCard>
410-
411-
<ctc:SettingsCard
404+
<ctc:SettingsExpander
412405
Margin="{StaticResource SettingsCardMargin}"
413-
Header="{strings:Resources Key=SettingsShowChaptersHeader}"
406+
Description="{x:Bind strings:Resources.SettingsOverlayControlsDescription}"
407+
Header="{x:Bind strings:Resources.SettingsOverlayControlsHeader}"
414408
HeaderIcon="{ui:FontIcon Glyph=&#xE75B;}">
415-
<ToggleSwitch x:Name="ShowChaptersToggleSwitch" IsOn="{x:Bind ViewModel.PlayerShowChapters, Mode=TwoWay}" />
416-
</ctc:SettingsCard>
409+
<ctc:SettingsExpander.Items>
410+
<ctc:SettingsCard Header="{x:Bind strings:Resources.SettingsShowControlsHeader}">
411+
<ToggleSwitch IsOn="{x:Bind ViewModel.PlayerShowControls, Mode=TwoWay}" />
412+
</ctc:SettingsCard>
413+
<ctc:SettingsCard Header="{x:Bind strings:Resources.SettingsShowChaptersHeader}">
414+
<ToggleSwitch IsOn="{x:Bind ViewModel.PlayerShowChapters, Mode=TwoWay}" />
415+
</ctc:SettingsCard>
416+
</ctc:SettingsExpander.Items>
417+
</ctc:SettingsExpander>
417418

418419
<ctc:SettingsExpander
419420
Margin="{StaticResource SettingsCardMargin}"

Screenbox/Strings/en-US/Resources.resw

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,12 @@
648648
<data name="SettingsVolumeBoostDescription" xml:space="preserve">
649649
<value>Allow the maximum volume to go above 100%</value>
650650
</data>
651+
<data name="SettingsOverlayControlsHeader" xml:space="preserve">
652+
<value>Overlay controls</value>
653+
</data>
654+
<data name="SettingsOverlayControlsDescription" xml:space="preserve">
655+
<value>Change the appearance and behavior of the on-screen player controls</value>
656+
</data>
651657
<data name="SettingsGesturesHeader" xml:space="preserve">
652658
<value>Gestures</value>
653659
</data>

0 commit comments

Comments
 (0)