Skip to content

Commit 9fa5b5b

Browse files
author
theweavrs
committed
minor ui improvements for SettingsViews
1 parent 0a13291 commit 9fa5b5b

File tree

8 files changed

+125
-25
lines changed

8 files changed

+125
-25
lines changed

‎BreadPlayer.Views.UWP/SettingsViews/AboutView.xaml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
mc:Ignorable="d">
99

1010
<ScrollViewer ScrollViewer.VerticalScrollBarVisibility="Auto">
11-
<StackPanel DataContext="{Binding Source={StaticResource Core}, Path=Instance.SettingsVm}" RequestedTheme="{Binding Source={StaticResource TextBrush}, Converter={StaticResource BrushToTheme}}">
11+
<StackPanel x:Name="mainPanel" DataContext="{Binding Source={StaticResource Core}, Path=Instance.SettingsVm}" RequestedTheme="{Binding Source={StaticResource TextBrush}, Converter={StaticResource BrushToTheme}}">
1212
<TextBlock
1313
x:Uid="versionHeader"
1414
FontSize="22"
@@ -88,5 +88,23 @@
8888
TextAlignment="Justify"
8989
TextWrapping="WrapWholeWords" />
9090
</StackPanel>
91+
<VisualStateManager.VisualStateGroups>
92+
<VisualStateGroup>
93+
<VisualState>
94+
<VisualState.StateTriggers>
95+
<AdaptiveTrigger MinWindowWidth="0" />
96+
</VisualState.StateTriggers>
97+
<VisualState.Setters>
98+
<Setter Target="mainPanel.Margin" Value="10,0,20,0" />
99+
</VisualState.Setters>
100+
</VisualState>
101+
<VisualState>
102+
<VisualState.StateTriggers>
103+
<AdaptiveTrigger MinWindowWidth="600" />
104+
</VisualState.StateTriggers>
105+
<VisualState.Setters />
106+
</VisualState>
107+
</VisualStateGroup>
108+
</VisualStateManager.VisualStateGroups>
91109
</ScrollViewer>
92110
</Page>

‎BreadPlayer.Views.UWP/SettingsViews/AccountsView.xaml‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d">
1010
<Page.Resources />
11-
<Grid DataContext="{Binding Source={StaticResource Core}, Path=Instance.SettingsVm.AccountSettingsVM}" RequestedTheme="{Binding Source={StaticResource TextBrush}, Converter={StaticResource BrushToTheme}}">
12-
<ScrollViewer>
13-
<Grid Name="RootGrid">
14-
<StackPanel x:Name="lastfmStackPanel" Grid.Column="1">
11+
<ScrollViewer>
12+
<StackPanel x:Name="mainPanel" DataContext="{Binding Source={StaticResource Core}, Path=Instance.SettingsVm.AccountSettingsVM}" RequestedTheme="{Binding Source={StaticResource TextBrush}, Converter={StaticResource BrushToTheme}}">
1513
<TextBlock
1614
x:Name="lastfmHeader"
1715
FontSize="22"
@@ -95,36 +93,24 @@
9593
<x:String>Xiami</x:String>
9694
</ComboBox>
9795
</StackPanel>
98-
</Grid>
99-
</ScrollViewer>
10096
<VisualStateManager.VisualStateGroups>
10197
<VisualStateGroup>
10298
<VisualState>
10399
<VisualState.StateTriggers>
104-
<AdaptiveTrigger MinWindowWidth="800" />
105-
</VisualState.StateTriggers>
106-
</VisualState>
107-
<VisualState>
108-
<VisualState.StateTriggers>
109-
<AdaptiveTrigger MinWindowWidth="500" />
100+
<AdaptiveTrigger MinWindowWidth="600" />
110101
</VisualState.StateTriggers>
111102
<VisualState.Setters>
112-
<Setter Target="lastfmStackPanel.(Grid.Column)" Value="0" />
113-
<Setter Target="lastfmStackPanel.(Grid.ColumnSpan)" Value="3" />
114-
<Setter Target="RootGrid.Margin" Value="25,50,25,0" />
115103
</VisualState.Setters>
116104
</VisualState>
117105
<VisualState>
118106
<VisualState.StateTriggers>
119107
<AdaptiveTrigger MinWindowWidth="0" />
120108
</VisualState.StateTriggers>
121109
<VisualState.Setters>
122-
<Setter Target="lastfmStackPanel.(Grid.Column)" Value="0" />
123-
<Setter Target="lastfmStackPanel.(Grid.ColumnSpan)" Value="3" />
124-
<Setter Target="lastfmHeader.FontSize" Value="18" />
110+
<Setter Target="mainPanel.Margin" Value="10,0,20,0" />
125111
</VisualState.Setters>
126112
</VisualState>
127113
</VisualStateGroup>
128114
</VisualStateManager.VisualStateGroups>
129-
</Grid>
115+
</ScrollViewer>
130116
</Page>

‎BreadPlayer.Views.UWP/SettingsViews/AudioSettingsView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</VisualState>
5454
<VisualState>
5555
<VisualState.StateTriggers>
56-
<AdaptiveTrigger MinWindowWidth="0" />
56+
<AdaptiveTrigger MinWindowWidth="600" />
5757
</VisualState.StateTriggers>
5858
<VisualState.Setters />
5959
</VisualState>

‎BreadPlayer.Views.UWP/SettingsViews/ContactView.xaml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
88
mc:Ignorable="d">
99

10-
<Grid RequestedTheme="{Binding Source={StaticResource TextBrush}, Converter={StaticResource BrushToTheme}}">
10+
<Grid x:Name="mainPanel" RequestedTheme="{Binding Source={StaticResource TextBrush}, Converter={StaticResource BrushToTheme}}">
1111
<Grid.RowDefinitions>
1212
<RowDefinition Height="Auto" />
1313
<RowDefinition Height="Auto" />
@@ -101,5 +101,24 @@
101101
<PathIcon Data="M8 20c0-1.105 0.895-2 2-2s2 0.895 2 2c0 1.105-0.895 2-2 2s-2-0.895-2-2zM20 20c0-1.105 0.895-2 2-2s2 0.895 2 2c0 1.105-0.895 2-2 2s-2-0.895-2-2zM20.097 24.274c0.515-0.406 1.262-0.317 1.668 0.198s0.317 1.262-0.198 1.668c-1.434 1.13-3.619 1.86-5.567 1.86s-4.133-0.73-5.567-1.86c-0.515-0.406-0.604-1.153-0.198-1.668s1.153-0.604 1.668-0.198c0.826 0.651 2.46 1.351 4.097 1.351s3.271-0.7 4.097-1.351zM32 16c0-2.209-1.791-4-4-4-1.504 0-2.812 0.83-3.495 2.057-2.056-1.125-4.561-1.851-7.29-2.019l2.387-5.36 4.569 1.319c0.411 1.167 1.522 2.004 2.83 2.004 1.657 0 3-1.343 3-3s-1.343-3-3-3c-1.142 0-2.136 0.639-2.642 1.579l-5.091-1.47c-0.57-0.164-1.173 0.116-1.414 0.658l-3.243 7.282c-2.661 0.187-5.102 0.907-7.114 2.007-0.683-1.227-1.993-2.056-3.496-2.056-2.209 0-4 1.791-4 4 0 1.635 0.981 3.039 2.387 3.659-0.252 0.751-0.387 1.535-0.387 2.341 0 5.523 6.268 10 14 10s14-4.477 14-10c0-0.806-0.134-1.589-0.387-2.34 1.405-0.62 2.387-2.025 2.387-3.66zM27 5.875c0.621 0 1.125 0.504 1.125 1.125s-0.504 1.125-1.125 1.125-1.125-0.504-1.125-1.125 0.504-1.125 1.125-1.125zM2 16c0-1.103 0.897-2 2-2 0.797 0 1.487 0.469 1.808 1.145-1.045 0.793-1.911 1.707-2.552 2.711-0.735-0.296-1.256-1.016-1.256-1.856zM16 29.625c-6.42 0-11.625-3.414-11.625-7.625s5.205-7.625 11.625-7.625c6.42 0 11.625 3.414 11.625 7.625s-5.205 7.625-11.625 7.625zM28.744 17.856c-0.641-1.003-1.507-1.918-2.552-2.711 0.321-0.676 1.011-1.145 1.808-1.145 1.103 0 2 0.897 2 2 0 0.84-0.52 1.56-1.256 1.856z" />
102102
</HyperlinkButton>
103103
</StackPanel>
104+
<VisualStateManager.VisualStateGroups>
105+
<VisualStateGroup>
106+
<VisualState>
107+
<VisualState.StateTriggers>
108+
<AdaptiveTrigger MinWindowWidth="600" />
109+
</VisualState.StateTriggers>
110+
<VisualState.Setters>
111+
</VisualState.Setters>
112+
</VisualState>
113+
<VisualState>
114+
<VisualState.StateTriggers>
115+
<AdaptiveTrigger MinWindowWidth="0" />
116+
</VisualState.StateTriggers>
117+
<VisualState.Setters>
118+
<Setter Target="mainPanel.Margin" Value="10,0,20,0" />
119+
</VisualState.Setters>
120+
</VisualState>
121+
</VisualStateGroup>
122+
</VisualStateManager.VisualStateGroups>
104123
</Grid>
105124
</Page>

‎BreadPlayer.Views.UWP/SettingsViews/ContributeView.xaml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
mc:Ignorable="d">
99

1010
<ScrollViewer>
11-
<Grid DataContext="{Binding Source={StaticResource Core}, Path=Instance.SettingsVm}" RequestedTheme="{Binding Source={StaticResource TextBrush}, Converter={StaticResource BrushToTheme}}">
11+
<Grid x:Name="mainPanel" DataContext="{Binding Source={StaticResource Core}, Path=Instance.SettingsVm}" RequestedTheme="{Binding Source={StaticResource TextBrush}, Converter={StaticResource BrushToTheme}}">
1212
<Grid.ColumnDefinitions>
1313
<ColumnDefinition Width="Auto" />
1414
<ColumnDefinition Width="*" />
@@ -171,5 +171,24 @@
171171
CommandParameter="https://github.com/theweavrs/BreadPlayer/wiki/Guide-For-Testers"
172172
Style="{StaticResource DateTimePickerFlyoutButtonStyle}" />
173173
</Grid>
174+
<VisualStateManager.VisualStateGroups>
175+
<VisualStateGroup>
176+
<VisualState>
177+
<VisualState.StateTriggers>
178+
<AdaptiveTrigger MinWindowWidth="600" />
179+
</VisualState.StateTriggers>
180+
<VisualState.Setters>
181+
</VisualState.Setters>
182+
</VisualState>
183+
<VisualState>
184+
<VisualState.StateTriggers>
185+
<AdaptiveTrigger MinWindowWidth="0" />
186+
</VisualState.StateTriggers>
187+
<VisualState.Setters>
188+
<Setter Target="mainPanel.Margin" Value="10,0,20,0" />
189+
</VisualState.Setters>
190+
</VisualState>
191+
</VisualStateGroup>
192+
</VisualStateManager.VisualStateGroups>
174193
</ScrollViewer>
175194
</Page>

‎BreadPlayer.Views.UWP/SettingsViews/CoreSettingsView.xaml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
mc:Ignorable="d">
99

1010
<ScrollViewer>
11-
<StackPanel DataContext="{Binding Source={StaticResource Core}, Path=Instance.SettingsVm}" RequestedTheme="{Binding Source={StaticResource TextBrush}, Converter={StaticResource BrushToTheme}}">
11+
<StackPanel x:Name="mainPanel" DataContext="{Binding Source={StaticResource Core}, Path=Instance.SettingsVm}" RequestedTheme="{Binding Source={StaticResource TextBrush}, Converter={StaticResource BrushToTheme}}">
1212
<TextBlock
1313
x:Name="resetHeader"
1414
x:Uid="resetHeader"
@@ -76,5 +76,24 @@
7676
<Run x:Uid="replaceLockscreenFurtherInfoText" FontWeight="Bold" />
7777
</TextBlock>
7878
</StackPanel>
79+
<VisualStateManager.VisualStateGroups>
80+
<VisualStateGroup>
81+
<VisualState>
82+
<VisualState.StateTriggers>
83+
<AdaptiveTrigger MinWindowWidth="600" />
84+
</VisualState.StateTriggers>
85+
<VisualState.Setters>
86+
</VisualState.Setters>
87+
</VisualState>
88+
<VisualState>
89+
<VisualState.StateTriggers>
90+
<AdaptiveTrigger MinWindowWidth="0" />
91+
</VisualState.StateTriggers>
92+
<VisualState.Setters>
93+
<Setter Target="mainPanel.Margin" Value="10,0,20,0" />
94+
</VisualState.Setters>
95+
</VisualState>
96+
</VisualStateGroup>
97+
</VisualStateManager.VisualStateGroups>
7998
</ScrollViewer>
8099
</Page>

‎BreadPlayer.Views.UWP/SettingsViews/KeyboardSettingsView.xaml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
mc:Ignorable="d">
99

1010
<ScrollViewer>
11-
<Grid HorizontalAlignment="Left" RequestedTheme="{Binding Source={StaticResource TextBrush}, Converter={StaticResource BrushToTheme}}">
11+
<Grid x:Name="mainPanel" HorizontalAlignment="Left" RequestedTheme="{Binding Source={StaticResource TextBrush}, Converter={StaticResource BrushToTheme}}">
1212
<Grid.ColumnDefinitions>
1313
<ColumnDefinition Width="*" />
1414
<ColumnDefinition Width="*" />
@@ -120,5 +120,24 @@
120120
Text=""
121121
TextAlignment="Center" />
122122
</Grid>
123+
<VisualStateManager.VisualStateGroups>
124+
<VisualStateGroup>
125+
<VisualState>
126+
<VisualState.StateTriggers>
127+
<AdaptiveTrigger MinWindowWidth="600" />
128+
</VisualState.StateTriggers>
129+
<VisualState.Setters>
130+
</VisualState.Setters>
131+
</VisualState>
132+
<VisualState>
133+
<VisualState.StateTriggers>
134+
<AdaptiveTrigger MinWindowWidth="0" />
135+
</VisualState.StateTriggers>
136+
<VisualState.Setters>
137+
<Setter Target="mainPanel.Margin" Value="10,0,20,0" />
138+
</VisualState.Setters>
139+
</VisualState>
140+
</VisualStateGroup>
141+
</VisualStateManager.VisualStateGroups>
123142
</ScrollViewer>
124143
</Page>

‎BreadPlayer.Views.UWP/SettingsViews/PersonlizationView.xaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
mc:Ignorable="d">
88
<ScrollViewer>
99
<StackPanel
10+
x:Name="mainPanel"
1011
Margin="10,0,0,0"
1112
DataContext="{Binding Source={StaticResource Core}, Path=Instance.SettingsVm.PersonalizationVM}"
1213
RequestedTheme="{Binding Source={StaticResource TextBrush}, Converter={StaticResource BrushToTheme}}">
@@ -68,5 +69,24 @@
6869
<x:String>Album art color</x:String>
6970
</ComboBox>
7071
</StackPanel>
72+
<VisualStateManager.VisualStateGroups>
73+
<VisualStateGroup>
74+
<VisualState>
75+
<VisualState.StateTriggers>
76+
<AdaptiveTrigger MinWindowWidth="600" />
77+
</VisualState.StateTriggers>
78+
<VisualState.Setters>
79+
</VisualState.Setters>
80+
</VisualState>
81+
<VisualState>
82+
<VisualState.StateTriggers>
83+
<AdaptiveTrigger MinWindowWidth="0" />
84+
</VisualState.StateTriggers>
85+
<VisualState.Setters>
86+
<Setter Target="mainPanel.Margin" Value="10,0,20,0" />
87+
</VisualState.Setters>
88+
</VisualState>
89+
</VisualStateGroup>
90+
</VisualStateManager.VisualStateGroups>
7191
</ScrollViewer>
7292
</Page>

0 commit comments

Comments
 (0)