Some minor UI tweaks

ColonelChocomel · Mar 22, 2022 · 32d4604 · 32d4604
1 parent 20da12e
commit 32d4604
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/ACCBroadcaster/Classes/Camera.cs b/ACCBroadcaster/Classes/Camera.cs
@@ -1,4 +1,5 @@
-using Microsoft.UI.Xaml.Media;
+using Microsoft.UI;
+using Microsoft.UI.Xaml.Media;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -45,7 +46,7 @@ public void SetActive(bool isActive)
             IsActive = isActive;
             if (isActive)
             {
-                BackgroundBrush = new SolidColorBrush(Microsoft.UI.Colors.Red);
+                BackgroundBrush = new SolidColorBrush(Colors.DodgerBlue);
             }
             else
             {

diff --git a/ACCBroadcaster/Classes/HUDOption.cs b/ACCBroadcaster/Classes/HUDOption.cs
@@ -1,4 +1,5 @@
-using Microsoft.UI.Xaml.Media;
+using Microsoft.UI;
+using Microsoft.UI.Xaml.Media;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -45,7 +46,7 @@ public void SetActive(bool isActive)
             IsActive = isActive;
             if (isActive)
             {
-                BackgroundBrush = new SolidColorBrush(Microsoft.UI.Colors.Red);
+                BackgroundBrush = new SolidColorBrush(Colors.DodgerBlue);
             }
             else
             {

diff --git a/ACCBroadcaster/Views/Broadcasting/CameraSelectorView.xaml.cs b/ACCBroadcaster/Views/Broadcasting/CameraSelectorView.xaml.cs
@@ -1,5 +1,6 @@
 using ACCBroadcaster.Classes;
 using ksBroadcastingNetwork.Structs;
+using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
@@ -160,7 +161,7 @@ private void IsOnboardActive(bool IsActive)
             if (IsActive)
             {
                 OnboardIsActive = true;
-                OnboardsComboBox.Background = new SolidColorBrush(Microsoft.UI.Colors.Red);
+                OnboardsComboBox.Background = new SolidColorBrush(Colors.DodgerBlue);
             } else
             {
                 OnboardIsActive = false;
@@ -173,7 +174,7 @@ private void IsDrivableActive(bool IsActive)
             if (IsActive)
             {
                 DrivableIsActive = true;
-                DrivableComboBox.Background = new SolidColorBrush(Microsoft.UI.Colors.Red);
+                DrivableComboBox.Background = new SolidColorBrush(Colors.DodgerBlue);
             }
             else
             {

diff --git a/ACCBroadcaster/Views/Broadcasting/CarListView.xaml b/ACCBroadcaster/Views/Broadcasting/CarListView.xaml
@@ -14,6 +14,11 @@
             <Setter Property="FontSize" Value="20"/>
             <Setter Property="Padding" Value="5"/>
         </Style>
+        <Style x:Key="DeltaTextStyle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="20"/>
+            <Setter Property="Padding" Value="5"/>
+            <Setter Property="Foreground" Value="Red"/>
+        </Style>
     </Page.Resources>
 
     <ScrollViewer VerticalScrollBarVisibility="Auto">
@@ -33,7 +38,7 @@
                 <ItemsControl.ItemTemplate>
                     <DataTemplate x:DataType="classes:Car">
                         <StackPanel Orientation="Horizontal" Background="{Binding BackgroundBrush, Mode=OneWay}">
-                            <TextBlock Text="{Binding PositionDelta, Mode=OneWay}" Style="{StaticResource TextStyle}" Width="90"/>
+                            <TextBlock Text="{Binding PositionDelta, Mode=OneWay}" Style="{StaticResource DeltaTextStyle}" Width="90"/>
                             <TextBlock Text="{Binding Position, Mode=OneWay}" Style="{StaticResource TextStyle}" Width="40"/>
                             <TextBlock Text="{Binding RaceNumber}" Style="{StaticResource TextStyle}" Width="40"/>
                             <TextBlock Text="{Binding DriverName, Mode=OneWay}" Style="{StaticResource TextStyle}" Width="250"/>

diff --git a/ACCBroadcaster/Views/Broadcasting/InstantReplayView.xaml b/ACCBroadcaster/Views/Broadcasting/InstantReplayView.xaml
@@ -11,19 +11,19 @@
     <Grid>
         <StackPanel Orientation="Vertical" Margin="5">
             <TextBlock FontSize="15" FontWeight="Bold">Instant Replay</TextBlock>
-            <StackPanel Orientation="Horizontal">
-                <Button Content="-10s" Click="StartInstantReplay" CommandParameter="10" Margin="5"></Button>
-                <Button Content="-20s" Click="StartInstantReplay" CommandParameter="20" Margin="5"></Button>
-                <Button Content="-30s" Click="StartInstantReplay" CommandParameter="30" Margin="5"></Button>
+            <StackPanel Orientation="Horizontal" Margin="5">
+                <Button Content="-10s" Click="StartInstantReplay" CommandParameter="10" Margin="5" Background="{ThemeResource ButtonBackgroundThemeBrush}"></Button>
+                <Button Content="-20s" Click="StartInstantReplay" CommandParameter="20" Margin="5" Background="{ThemeResource ButtonBackgroundThemeBrush}"></Button>
+                <Button Content="-30s" Click="StartInstantReplay" CommandParameter="30" Margin="5" Background="{ThemeResource ButtonBackgroundThemeBrush}"></Button>
             </StackPanel>
             <TextBlock>Custom length:</TextBlock>
             <StackPanel Orientation="Horizontal">
                 <NumberBox x:Name="CustomLengthNumberBox"
                 Value="5"
                 SpinButtonPlacementMode="Inline"
                 SmallChange="5"
-                Margin="5"/>
-                <Button Content="Start Custom" Click="StartInstantReplay" Margin="5, 0"></Button>
+                Margin="10"/>
+                <Button Content="Start Custom" Click="StartInstantReplay" Background="{ThemeResource ButtonBackgroundThemeBrush}"></Button>
             </StackPanel>
         </StackPanel>
     </Grid>