Type identifier in preview compact bubble. (#13394)

reddyashish · web-flow · commit 8df1cfabbf15 · 2022-10-12T12:37:12.000-04:00
* Type identifier in preview compact bubble.

* addressing comments
diff --git a/src/DynamoCoreWpf/UI/Converters.cs b/src/DynamoCoreWpf/UI/Converters.cs
@@ -3311,16 +3311,18 @@ public object Convert(object[] values, Type targetType, object parameter, System
             {
                 switch (values[0])
                 {
-                    case WatchViewModel.objectType:
+                    case nameof(TypeCode.Object):
                         return resourceDictionary["objectLabelBackground"] as SolidColorBrush;
-                    case WatchViewModel.doubleType:
+                    case nameof(TypeCode.Double):
                         return resourceDictionary["numberLabelBackground"] as SolidColorBrush;
-                    case WatchViewModel.intType:
+                    case nameof(TypeCode.Int32):
                         return resourceDictionary["numberLabelBackground"] as SolidColorBrush;
-                    case WatchViewModel.stringType:
+                    case nameof(TypeCode.Int64):
+                        return resourceDictionary["numberLabelBackground"] as SolidColorBrush;
+                    case nameof(TypeCode.String):
                         return resourceDictionary["stringLabelBackground"] as SolidColorBrush;
-                    case WatchViewModel.boolType:
-                        return resourceDictionary["boolLabelBackground"] as SolidColorBrush;                                                
+                    case nameof(TypeCode.Boolean):
+                        return resourceDictionary["boolLabelBackground"] as SolidColorBrush;                                        
                     default:
                         if (values[1].ToString() == "List")
                         {
@@ -3523,4 +3525,4 @@ public object ConvertBack(object value, Type targetType, object parameter, Syste
 
         #endregion
     }
-}
+}
diff --git a/src/DynamoCoreWpf/Utilities/CompactBubbleHandler.cs b/src/DynamoCoreWpf/Utilities/CompactBubbleHandler.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Linq;
 using Dynamo.Extensions;
 using Dynamo.ViewModels;
@@ -24,6 +24,7 @@ public static CompactBubbleViewModel Process(MirrorData value)
         {
             items = 0;
             var viewModel = ProcessThing(value, true);
+            viewModel.SetObjectType(value.Data);
             viewModel.NumberOfItems = items;
             return viewModel;
         }
diff --git a/src/DynamoCoreWpf/ViewModels/Preview/CompactBubbleViewModel.cs b/src/DynamoCoreWpf/ViewModels/Preview/CompactBubbleViewModel.cs
@@ -1,13 +1,19 @@
-﻿namespace Dynamo.ViewModels
+using System;
+using System.Globalization;
+using Dynamo.Configuration;
+using Dynamo.Wpf.Properties;
+
+namespace Dynamo.ViewModels
 {
     /// <summary>
     /// Class containing data to display in compact preview bubble
     /// </summary>
     public class CompactBubbleViewModel : ViewModelBase
     {
         #region Properties
-
         private string nodeLabel;
+        private string valueType;
+
         /// <summary>
         /// Represents type of node output
         /// </summary>
@@ -21,6 +27,12 @@ public string NodeLabel
             }
         }
 
+        public string ValueType
+        {
+            get { return valueType; }
+            set { valueType = value; RaisePropertyChanged(nameof(ValueType)); }
+        }
+
         private int numberOfItems;
         /// <summary>
         /// Number of items in the overall list if node output is a list
@@ -72,6 +84,38 @@ public CompactBubbleViewModel(string nodeLabel, int items)
             NumberOfItems = items;
         }
 
+        public void SetObjectType(object obj)
+        {
+            if (obj != null)
+            {
+                ValueType = GetDisplayType(obj);
+            }
+        }
+
+        private string GetDisplayType(object obj)
+        {
+            TypeCode typeCode = Type.GetTypeCode(obj.GetType());
+
+            switch (typeCode)
+            {
+                case TypeCode.Boolean:
+                    return nameof(TypeCode.Boolean);
+                case TypeCode.Double:
+                    return nameof(TypeCode.Double);
+                case TypeCode.Int64:
+                    return nameof(TypeCode.Int64);
+                case TypeCode.Int32:
+                    return nameof(TypeCode.Int32);
+                case TypeCode.Object:
+                    return nameof(TypeCode.Object);
+                case TypeCode.String:
+                    return nameof(TypeCode.String);
+                case TypeCode.Empty:
+                    return string.Empty;
+                default:
+                    return string.Empty;
+            }
+        }
         #endregion
     }
 }
diff --git a/src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
@@ -18,12 +18,6 @@ public class WatchViewModel : NotificationObject
         // For more info: https://msdn.microsoft.com/en-us/library/kfsatb94(v=vs.110).aspx
         private const string numberFormat = "g";
 
-        internal const string doubleType = "double";
-        internal const string boolType = "bool";
-        internal const string intType = "int";
-        internal const string objectType = "object";
-        internal const string stringType = "string";
-
         #region Events
 
         public event Action Clicked;
@@ -290,17 +284,17 @@ private string GetDisplayType(object obj)
             switch (typeCode)
             {
                 case TypeCode.Boolean:
-                    return boolType;
+                    return nameof(TypeCode.Boolean);
                 case TypeCode.Double:
-                    return doubleType;
+                    return nameof(TypeCode.Double);
                 case TypeCode.Int64:
-                    return intType;
+                    return nameof(TypeCode.Int64);
                 case TypeCode.Int32:
-                    return intType;
+                    return nameof(TypeCode.Int32);
                 case TypeCode.Object:
-                    return objectType;
+                    return nameof(TypeCode.Object);
                 case TypeCode.String:
-                    return stringType;
+                    return nameof(TypeCode.String);
                 case TypeCode.Empty:
                     return String.Empty;
                 default:
diff --git a/src/DynamoCoreWpf/Views/Preview/PreviewCompactView.xaml b/src/DynamoCoreWpf/Views/Preview/PreviewCompactView.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl x:Class="Dynamo.UI.Controls.PreviewCompactView"
+<UserControl x:Class="Dynamo.UI.Controls.PreviewCompactView"
              xmlns="https://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="https://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="https://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -21,7 +21,14 @@
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="15" />
         </Grid.ColumnDefinitions>
-        <TextBlock Name="Label" Foreground="{StaticResource PrimaryCharcoal200Brush}" Grid.Column="0" Margin="10,5,0,5" FontFamily="{StaticResource SourceCodePro}" Text="{Binding Path=NodeLabel}" />
+        <TextBlock Name="Label" Grid.Column="0" Margin="10,5,0,5" FontFamily="{StaticResource SourceCodePro}" Text="{Binding Path=NodeLabel}">
+            <TextBlock.Foreground>
+                <MultiBinding Converter="{StaticResource ObjectTypeConverter}">
+                    <Binding Path="ValueType" />
+                    <Binding Path="NodeLabel" />
+                </MultiBinding>
+            </TextBlock.Foreground>
+        </TextBlock>
 
         <TextBlock Name="Items" Grid.Column="2" Margin="0,3,0,7" Foreground="{StaticResource PrimaryCharcoal200Brush}"
                    FontFamily="{StaticResource SourceCodePro}"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using Dynamo.Extensions;`
`4`	`4`	`using Dynamo.ViewModels;`
`@@ -24,6 +24,7 @@ public static CompactBubbleViewModel Process(MirrorData value)`
`24`	`24`	`{`
`25`	`25`	`items = 0;`
`26`	`26`	`var viewModel = ProcessThing(value, true);`
	`27`	`+ viewModel.SetObjectType(value.Data);`
`27`	`28`	`viewModel.NumberOfItems = items;`
`28`	`29`	`return viewModel;`
`29`	`30`	`}`