UI Improvements: Colors

leomotors · Apr 25, 2022 · 40ab165 · 40ab165
1 parent 976d4b1
commit 40ab165
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 51 deletions.
diff --git a/TestForFailure/UnitTestApp.xaml.cs b/TestForFailure/UnitTestApp.xaml.cs
@@ -4,6 +4,7 @@
 global using System.Threading.Tasks;
 global using Microsoft.VisualStudio.TestTools.UnitTesting;
 
+using Microsoft.VisualStudio.TestPlatform.TestExecutor;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
 using Windows.UI.Xaml;
@@ -56,12 +57,12 @@ protected override void OnLaunched(LaunchActivatedEventArgs e) {
             Window.Current.Content = rootFrame;
         }
 
-        Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI();
+        UnitTestClient.CreateDefaultUI();
 
         // Ensure the current window is active
         Window.Current.Activate();
 
-        Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(e.Arguments);
+        UnitTestClient.Run(e.Arguments);
     }
 
     /// <summary>

diff --git a/YouAreAFailure/Controls/ExternalLink.xaml b/YouAreAFailure/Controls/ExternalLink.xaml
@@ -9,10 +9,7 @@
     d:DesignWidth="400"
     mc:Ignorable="d">
 
-    <HyperlinkButton
-        NavigateUri="{x:Bind Url, Mode=OneWay}"
-        PointerEntered="OnPointerEntered"
-        PointerExited="OnPointerExited">
+    <HyperlinkButton NavigateUri="{x:Bind Url, Mode=OneWay}">
         <StackPanel Orientation="Horizontal">
             <TextBlock Text="{x:Bind Text, Mode=OneWay}" />
             <FontIcon
@@ -21,7 +18,6 @@
                 VerticalAlignment="Center"
                 FontFamily="{StaticResource SymbolThemeFontFamily}"
                 FontSize="16"
-                Foreground="Blue"
                 Glyph="&#xE8A7;" />
         </StackPanel>
     </HyperlinkButton>

diff --git a/YouAreAFailure/Controls/ExternalLink.xaml.cs b/YouAreAFailure/Controls/ExternalLink.xaml.cs
@@ -1,25 +1,10 @@
-using Windows.UI;
-using Windows.UI.Xaml.Input;
-
-#nullable enable
+#nullable enable
 
 namespace YouAreAFailure.Controls;
 
 public sealed partial class ExternalLink : UserControl {
-    private static readonly Color lightNormalExtLink =
-         Color.FromArgb(255, 0, 62, 146);
-
-    private static readonly Color ExtLinkColor =
-        App.Current.IsLightTheme
-            ? lightNormalExtLink
-            : Color.FromArgb(255, 153, 235, 255);
-
-    private static readonly bool isLightTheme = App.Current.IsLightTheme;
-
     public ExternalLink() {
         this.InitializeComponent();
-
-        ExtIcon.Foreground = new SolidColorBrush(ExtLinkColor);
     }
 
     public string Text {
@@ -47,18 +32,4 @@ public string Url {
             typeof(ExternalLink),
             new PropertyMetadata(string.Empty)
         );
-
-    private void OnPointerEntered(object sender, PointerRoutedEventArgs e) {
-        if (isLightTheme) {
-            ExtIcon.Foreground =
-                new SolidColorBrush(Color.FromArgb(255, 0, 26, 104));
-        }
-    }
-
-    private void OnPointerExited(object sender, PointerRoutedEventArgs e) {
-        if (isLightTheme) {
-            ExtIcon.Foreground =
-                new SolidColorBrush(lightNormalExtLink);
-        }
-    }
 }
diff --git a/YouAreAFailure/Failure/Statistics.xaml.cs b/YouAreAFailure/Failure/Statistics.xaml.cs
@@ -44,26 +44,23 @@ protected override void OnNavigatedTo(NavigationEventArgs e) {
         base.OnNavigatedTo(e);
     }
 
-    // https://blog.mzikmund.com/2020/07/highlighting-dates-in-uwp-calendarview/#comments
-    private void HighlightDay(CalendarViewDayItem day, Color color) {
-        day.Background = new SolidColorBrush(color);
-    }
+    private readonly SolidColorBrush CalenderColor =
+        new((Color)Application.Current.Resources[
+            App.Current.IsLightTheme ? "SystemAccentColorLight2" : "SystemAccentColorDark2"]);
 
-    private readonly Color AkiColor =
-        App.Current.IsLightTheme
-            ? Color.FromArgb(255, 111, 159, 216)
-            : Color.FromArgb(255, 36, 44, 80);
+    private readonly SolidColorBrush TransparentBrush = new(Colors.Transparent);
 
     private void FailureCalendar_DayItemChanging(CalendarView sender, CalendarViewDayItemChangingEventArgs args) {
         var dateOffset = args.Item.Date;
         DateTime date = new(dateOffset.Year, dateOffset.Month, dateOffset.Day);
 
         var color =
             App.Current.State.WatchedDate.Contains(date) && date != Today
-                ? AkiColor
-                : Colors.Transparent;
+                ? CalenderColor
+                : TransparentBrush;
 
-        HighlightDay(args.Item, color);
+        // https://blog.mzikmund.com/2020/07/highlighting-dates-in-uwp-calendarview/#comments
+        args.Item.Background = color;
     }
 
     private async void ShareButton_Click(object sender, RoutedEventArgs e) {

diff --git a/YouAreAFailure/MainPage.xaml.cs b/YouAreAFailure/MainPage.xaml.cs
@@ -92,7 +92,7 @@ private void UpdateTitleBarLayout(CoreApplicationViewTitleBar coreTitleBar) {
     }
 
     // Update the TitleBar based on the inactive/active state of the app
-    private void Current_Activated(object sender, Windows.UI.Core.WindowActivatedEventArgs e) {
+    private void Current_Activated(object sender, WindowActivatedEventArgs e) {
         var defaultForegroundBrush =
             (SolidColorBrush)Application.Current.Resources["TextFillColorPrimaryBrush"];
         var inactiveForegroundBrush =

diff --git a/YouAreAFailure/Package.appxmanifest b/YouAreAFailure/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="65313Leomotors.YouareaFailure"
     Publisher="CN=E10452D0-AB02-4FD0-8CF3-B1A36A4584AA"
-    Version="1.0.73.0" />
+    Version="1.0.76.0" />
 
   <mp:PhoneIdentity PhoneProductId="9b164781-9d5e-4668-89da-851e4bb1ad57" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

diff --git a/YouAreAFailure/Package.debug.appxmanifest b/YouAreAFailure/Package.debug.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="Leomotors.YouAreAFailure.Debug"
     Publisher="CN=Leomotors"
-    Version="1.0.73.0" />
+    Version="1.0.76.0" />
 
   <mp:PhoneIdentity PhoneProductId="54184a93-8dcf-4a09-9cf4-cee9c428cbf4" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>