Skip to content

Commit bf20e02

Browse files
BitTimBitTim
committed
[VEX-86]: Added 8 more color options
1 parent 451ec25 commit bf20e02

File tree

14 files changed

+248
-14
lines changed

14 files changed

+248
-14
lines changed

‎VexTrack/App.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919

2020
<ResourceDictionary Source="Theme/Icons.xaml"/>
2121

22+
<ResourceDictionary Source="Theme/RadioSelectorButtonTheme.xaml"/>
2223
<ResourceDictionary Source="Theme/MenuButtonTheme.xaml"/>
2324
<ResourceDictionary Source="Theme/TitleBarButtonTheme.xaml"/>
2425
<ResourceDictionary Source="Theme/CheckBoxTheme.xaml"/>
2526
<ResourceDictionary Source="Theme/ButtonTheme.xaml"/>
2627
<ResourceDictionary Source="Theme/TextBoxTheme.xaml"/>
2728
<ResourceDictionary Source="Theme/AddButtonTheme.xaml"/>
2829
<ResourceDictionary Source="Theme/HueSliderTheme.xaml"/>
29-
<ResourceDictionary Source="Theme/RadioSelectorButtonTheme.xaml"/>
3030

3131
<ResourceDictionary Source="Theme/HistoryButtonTheme.xaml"/>
3232
<ResourceDictionary Source="Theme/ProgressArcTheme.xaml"/>

‎VexTrack/Core/Constants.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,15 @@ static class Constants
8585
["Orange"] = "Theme/AccentColors/Orange.xaml",
8686
["Red"] = "Theme/AccentColors/Red.xaml",
8787
["Purple"] = "Theme/AccentColors/Purple.xaml",
88-
["Mono"] = "Theme/AccentColors/Mono.xaml"
88+
["Mono"] = "Theme/AccentColors/Mono.xaml",
89+
["HotCold"] = "Theme/AccentColors/HotCold.xaml",
90+
["Cyberpunk"] = "Theme/AccentColors/Cyberpunk.xaml",
91+
["Lavender"] = "Theme/AccentColors/Lavender.xaml",
92+
["Aqua"] = "Theme/AccentColors/Aqua.xaml",
93+
["Nature"] = "Theme/AccentColors/Nature.xaml",
94+
["Emerald"] = "Theme/AccentColors/Emerald.xaml",
95+
["Fire"] = "Theme/AccentColors/Fire.xaml",
96+
["Cyberpunk2"] = "Theme/AccentColors/Cyberpunk2.xaml",
8997
};
9098

9199
public static readonly string ReleasesURL = "https://api.github.com/repos/BitTim/VexTrack/releases";

‎VexTrack/MVVM/View/SettingsView.xaml‎

Lines changed: 76 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
Margin="8, 0, 8, 24">
201201
<Grid.RowDefinitions>
202202
<RowDefinition Height="36"/>
203-
<RowDefinition Height="36"/>
203+
<RowDefinition Height="Auto"/>
204204
<RowDefinition Height="*"/>
205205
</Grid.RowDefinitions>
206206

@@ -250,11 +250,11 @@
250250
Grid.Column="0"
251251
FontSize="14"
252252
FontWeight="Bold"
253-
VerticalAlignment="Center"
253+
VerticalAlignment="Top"
254254
Foreground="{DynamicResource Foreground}"
255255
Margin="0, 0, 0, 4"/>
256256

257-
<StackPanel Grid.Row="1"
257+
<WrapPanel Grid.Row="1"
258258
Grid.Column="1"
259259
Orientation="Horizontal"
260260
VerticalAlignment="Center"
@@ -265,64 +265,128 @@
265265
Command="{Binding AccentButtonCommand}"
266266
CommandParameter="Blue"
267267
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Blue, Mode=OneWay}"
268-
Margin="0, 0, 4, 0"/>
268+
Margin="0, 0, 4, 4"/>
269269

270270
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
271271
Background="{StaticResource AccTeal}"
272272
Foreground="{StaticResource White}"
273273
Command="{Binding AccentButtonCommand}"
274274
CommandParameter="Teal"
275275
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Teal, Mode=OneWay}"
276-
Margin="0, 0, 4, 0"/>
276+
Margin="0, 0, 4, 4"/>
277277

278278
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
279279
Background="{StaticResource AccGreen}"
280280
Foreground="{StaticResource White}"
281281
Command="{Binding AccentButtonCommand}"
282282
CommandParameter="Green"
283283
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Green, Mode=OneWay}"
284-
Margin="0, 0, 4, 0"/>
284+
Margin="0, 0, 4, 4"/>
285285

286286
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
287287
Background="{StaticResource AccYellow}"
288288
Foreground="{StaticResource White}"
289289
Command="{Binding AccentButtonCommand}"
290290
CommandParameter="Yellow"
291291
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Yellow, Mode=OneWay}"
292-
Margin="0, 0, 4, 0"/>
292+
Margin="0, 0, 4, 4"/>
293293

294294
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
295295
Background="{StaticResource AccOrange}"
296296
Foreground="{StaticResource White}"
297297
Command="{Binding AccentButtonCommand}"
298298
CommandParameter="Orange"
299299
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Orange, Mode=OneWay}"
300-
Margin="0, 0, 4, 0"/>
300+
Margin="0, 0, 4, 4"/>
301301

302302
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
303303
Background="{StaticResource AccRed}"
304304
Foreground="{StaticResource White}"
305305
Command="{Binding AccentButtonCommand}"
306306
CommandParameter="Red"
307307
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Red, Mode=OneWay}"
308-
Margin="0, 0, 4, 0"/>
308+
Margin="0, 0, 4, 4"/>
309309

310310
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
311311
Background="{StaticResource AccPurple}"
312312
Foreground="{StaticResource White}"
313313
Command="{Binding AccentButtonCommand}"
314314
CommandParameter="Purple"
315315
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Purple, Mode=OneWay}"
316-
Margin="0, 0, 4, 0"/>
316+
Margin="0, 0, 4, 4"/>
317317

318318
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
319319
Background="{DynamicResource AccMono}"
320320
Foreground="{StaticResource White}"
321321
Command="{Binding AccentButtonCommand}"
322322
CommandParameter="Mono"
323323
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Mono, Mode=OneWay}"
324-
Margin="0, 0, 4, 0"/>
325-
</StackPanel>
324+
Margin="0, 0, 4, 4"/>
325+
326+
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
327+
Background="{StaticResource AccAqua}"
328+
Foreground="{StaticResource White}"
329+
Command="{Binding AccentButtonCommand}"
330+
CommandParameter="Aqua"
331+
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Aqua, Mode=OneWay}"
332+
Margin="0, 0, 4, 4"/>
333+
334+
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
335+
Background="{StaticResource AccEmerald}"
336+
Foreground="{StaticResource White}"
337+
Command="{Binding AccentButtonCommand}"
338+
CommandParameter="Emerald"
339+
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Emerald, Mode=OneWay}"
340+
Margin="0, 0, 4, 4"/>
341+
342+
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
343+
Background="{StaticResource AccFire}"
344+
Foreground="{StaticResource White}"
345+
Command="{Binding AccentButtonCommand}"
346+
CommandParameter="Fire"
347+
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Fire, Mode=OneWay}"
348+
Margin="0, 0, 4, 4"/>
349+
350+
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
351+
Background="{StaticResource AccLavender}"
352+
Foreground="{StaticResource White}"
353+
Command="{Binding AccentButtonCommand}"
354+
CommandParameter="Lavender"
355+
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Lavender, Mode=OneWay}"
356+
Margin="0, 0, 4, 4"/>
357+
358+
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
359+
Background="{StaticResource AccNature}"
360+
Foreground="{StaticResource White}"
361+
Command="{Binding AccentButtonCommand}"
362+
CommandParameter="Nature"
363+
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Nature, Mode=OneWay}"
364+
Margin="0, 0, 4, 4"/>
365+
366+
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
367+
Background="{StaticResource AccHotCold}"
368+
Foreground="{StaticResource White}"
369+
Command="{Binding AccentButtonCommand}"
370+
CommandParameter="HotCold"
371+
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=HotCold, Mode=OneWay}"
372+
Margin="0, 0, 4, 4"/>
373+
374+
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
375+
Background="{StaticResource AccCyberpunk}"
376+
Foreground="{StaticResource White}"
377+
Command="{Binding AccentButtonCommand}"
378+
CommandParameter="Cyberpunk"
379+
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Cyberpunk, Mode=OneWay}"
380+
Margin="0, 0, 4, 4"/>
381+
382+
<RadioButton Style="{StaticResource RadioColorSelectorButtonTheme}"
383+
Background="{StaticResource AccCyberpunk2}"
384+
Foreground="{StaticResource White}"
385+
Command="{Binding AccentButtonCommand}"
386+
CommandParameter="Cyberpunk2"
387+
IsChecked="{Binding Accent, Converter={StaticResource DataStringToBoolConv}, ConverterParameter=Cyberpunk2, Mode=OneWay}"
388+
Margin="0, 0, 4, 4"/>
389+
</WrapPanel>
326390
</Grid>
327391
</Grid>
328392
</ScrollViewer>

‎VexTrack/Theme/AccentColors/Aqua.xaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
<LinearGradientBrush x:Key="Accent">
4+
<GradientStop Color="{StaticResource Aqua1}" Offset="0.0"/>
5+
<GradientStop Color="{StaticResource Aqua2}" Offset="1.0"/>
6+
</LinearGradientBrush>
7+
</ResourceDictionary>

‎VexTrack/Theme/AccentColors/Cyberpunk.xaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
<LinearGradientBrush x:Key="Accent">
4+
<GradientStop Color="{StaticResource Cyberpunk1}" Offset="0.0"/>
5+
<GradientStop Color="{StaticResource Cyberpunk2}" Offset="1.0"/>
6+
</LinearGradientBrush>
7+
</ResourceDictionary>

‎VexTrack/Theme/AccentColors/Cyberpunk2.xaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
<LinearGradientBrush x:Key="Accent">
4+
<GradientStop Color="{StaticResource Cyberpunk3}" Offset="0.0"/>
5+
<GradientStop Color="{StaticResource Cyberpunk4}" Offset="1.0"/>
6+
</LinearGradientBrush>
7+
</ResourceDictionary>

‎VexTrack/Theme/AccentColors/Emerald.xaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
<LinearGradientBrush x:Key="Accent">
4+
<GradientStop Color="{StaticResource Emerald1}" Offset="0.0"/>
5+
<GradientStop Color="{StaticResource Emerald2}" Offset="1.0"/>
6+
</LinearGradientBrush>
7+
</ResourceDictionary>

‎VexTrack/Theme/AccentColors/Fire.xaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
<LinearGradientBrush x:Key="Accent">
4+
<GradientStop Color="{StaticResource Fire1}" Offset="0.0"/>
5+
<GradientStop Color="{StaticResource Fire2}" Offset="1.0"/>
6+
</LinearGradientBrush>
7+
</ResourceDictionary>

‎VexTrack/Theme/AccentColors/HotCold.xaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
<LinearGradientBrush x:Key="Accent">
4+
<GradientStop Color="{StaticResource Red1}" Offset="0.0"/>
5+
<GradientStop Color="{StaticResource Blue1}" Offset="1.0"/>
6+
</LinearGradientBrush>
7+
</ResourceDictionary>

‎VexTrack/Theme/AccentColors/Lavender.xaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
<LinearGradientBrush x:Key="Accent">
4+
<GradientStop Color="{StaticResource Lavender1}" Offset="0.0"/>
5+
<GradientStop Color="{StaticResource Lavender2}" Offset="1.0"/>
6+
</LinearGradientBrush>
7+
</ResourceDictionary>

0 commit comments

Comments
 (0)