Merge pull request #467 from trimble-oss/copilot/fix-code-scanning-alerts

Resolve 4 error-severity CodeQL findings blocking policy compliance

Author: rthanga1

Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml.cs

@@ -201,7 +201,7 @@ private void OnSelected(object sender, SelectedItemChangedEventArgs e)
         var newItem = e.SelectedItem;
         var newIndex = e.SelectedItemIndex;
 
-        // Always update (even if newItem is null – that represents clearing)
+        // Always update (even if newItem is null � that represents clearing)
         SelectedItem = newItem;
         SelectedIndex = newIndex;
 
@@ -332,10 +332,10 @@ private void UpdateListBorderHeight(IEnumerable items)
 
             if (itemCount < 4)
             {
-                desiredHeight = itemCount * 56;
-                margin = new Thickness(0, ((itemCount - 1) * 56) + 4, 10, 0);
+                desiredHeight = itemCount * 56.0;
+                margin = new Thickness(0, ((itemCount - 1) * 56.0) + 4.0, 10, 0);
 #if WINDOWS
-                margin = new Thickness(0, ((itemCount - 1) * 56) + 30, 10, 0);
+                margin = new Thickness(0, ((itemCount - 1) * 56.0) + 30.0, 10, 0);
 #endif
             }
         }

Trimble.Modus.Components/Controls/TMSpinner/TMSpinner.cs

@@ -103,7 +103,6 @@ private static void OnSpinnerSizeChanged(BindableObject bindable, object oldValu
         {
             if (bindable is TMSpinner tmSpinner)
             {
-                Console.WriteLine("Spinner Size Changed", (Size)newValue);
                 switch ((Size)newValue)
                 {
                     case Size.XSmall:

Trimble.Modus.Components/Helpers/ResourceDictionary.cs

@@ -1,25 +1,42 @@
 namespace Trimble.Modus.Components.Helpers;
-
-public static class ResourcesDictionary
-{
-    public static Color GetColor(string styleKey)
-    {
-        if (Application.Current.Resources.ContainsKey(styleKey))
-        {
-            return Application.Current.Resources[styleKey] as Color;
-        }
-        else
-        {
-            ResourceDictionary style = new Styles.LightThemeColors();
-            if (Application.Current.RequestedTheme == AppTheme.Dark)
-            {
-                style = new Styles.DarkThemeColors();
-            }
-            if (style.ContainsKey(styleKey))
-            {
-                return style[styleKey] as Color;
-            }
-        }
-        return Colors.Transparent;
-    }
-}
+
+public static class ResourcesDictionary
+{
+    public static Color GetColor(string styleKey)
+    {
+        if (Application.Current?.Resources is ResourceDictionary resources &&
+            resources.TryGetValue(styleKey, out var applicationResource) &&
+            applicationResource is Color applicationColor)
+        {
+            return applicationColor;
+        }
+
+        if (Application.Current?.Resources is ResourceDictionary appResources)
+        {
+            var preferredType = Application.Current.RequestedTheme == AppTheme.Dark
+                ? typeof(Styles.DarkThemeColors)
+                : typeof(Styles.LightThemeColors);
+
+            foreach (var dictionary in appResources.MergedDictionaries)
+            {
+                if (dictionary.GetType() == preferredType &&
+                    dictionary.TryGetValue(styleKey, out var themeResource) &&
+                    themeResource is Color themeColor)
+                {
+                    return themeColor;
+                }
+            }
+
+            foreach (var dictionary in appResources.MergedDictionaries)
+            {
+                if (dictionary.TryGetValue(styleKey, out var mergedResource) &&
+                    mergedResource is Color mergedColor)
+                {
+                    return mergedColor;
+                }
+            }
+        }
+
+        return Colors.Transparent;
+    }
+}