Added padding and margin

Author: Pepsi1x1

VisualDebug.Models/RenderRepresentation.cs

@@ -19,6 +19,10 @@ public class RenderRepresentation
 
         public RenderBounds Bounds { get; set; }
 
+        public RenderThickness Margin { get; set; }
+
+        public RenderThickness Padding { get; set; }
+
         [Newtonsoft.Json.JsonProperty(DefaultValueHandling = Newtonsoft.Json.DefaultValueHandling.Ignore, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore, PropertyName = "children", Required = Newtonsoft.Json.Required.AllowNull)]
         [System.Runtime.Serialization.DataMember(EmitDefaultValue = false, IsRequired = false, Name = "children")]
         public List<RenderRepresentation> Children { get; set; }

VisualDebug.Models/RenderThickness.cs

@@ -0,0 +1,15 @@
+namespace VisualDebug.Models
+{
+    public class RenderThickness
+    {
+        public double Bottom { get; set; }
+        public double Right { get; set; }
+        public double Top { get; set; }
+        public double Left { get; set; }
+
+        public override string ToString()
+        {
+            return $"{{Left={Left} Top={Top} Right={Right} Bottom={Bottom}}}";
+        }
+    }
+}

XamarinForms.VisualDebug.App/renderer/chart.js

@@ -19,7 +19,7 @@ var orgChart = (function () {
 		/* Configuration */
 		_duration = 750,        /* Duration of the animations */
 		_rectW = 180,        /* Width of the rectangle */
-		_rectH = 120,         /* Height of the rectangle */
+		_rectH = 150,         /* Height of the rectangle */
 		_rectSpacing = 120,          /* Spacing between the rectangles */
 		_fixedDepth = 200,         /* Height of the line for child nodes */
 		_mode = "line",     /* Choose the values "line" or "diagonal" */
@@ -184,6 +184,36 @@ var orgChart = (function () {
 					return "Height:" + d.Bounds.Height;
 				});
 
+			currentYOffset += _labelSize + _labelMargin;
+			nodeEnter.append("text")
+				.attr("x", 5)
+				.attr("y", currentYOffset)
+				.attr("dy", _labelSize + "px")
+				.attr("text-anchor", "left")
+				.style("cursor", function (d) { return (d.children || d._children || d.hasChild) ? "pointer" : "default"; })
+				.text(function (d) {
+					if (d.Margin === null || d.Margin === undefined) {
+						return "Margin: N/A";
+					}
+					
+					return "Margin:" + d.Margin.Left + "," + d.Margin.Top + "," + d.Margin.Right + "," + d.Margin.Bottom;
+				});
+
+			currentYOffset += _labelSize + _labelMargin;
+			nodeEnter.append("text")
+				.attr("x", 5)
+				.attr("y", currentYOffset)
+				.attr("dy", _labelSize + "px")
+				.attr("text-anchor", "left")
+				.style("cursor", function (d) { return (d.children || d._children || d.hasChild) ? "pointer" : "default"; })
+				.text(function (d) {
+					if (d.Padding  === null || d.Padding === undefined) {
+						return "Padding: N/A";
+					}
+
+					return "Padding:" + d.Padding.Left + "," + d.Padding.Top + "," + d.Padding.Right + "," + d.Padding.Bottom;
+				});
+
 			nodeEnter.append("image")
 				.attr("x", _rectW)
 				.attr("y", 0)

XamarinForms.VisualDebug.Core/Sender.cs

@@ -15,7 +15,7 @@ public class Sender
 
         private static readonly System.Net.Http.HttpClient httpClient = new System.Net.Http.HttpClient(httpClientHandler);
 
-        public async System.Threading.Tasks.Task<System.Net.Http.HttpResponseMessage> SendToServer(string packet, string ip = "192.168.1.153", string port = "3000")
+        public async System.Threading.Tasks.Task<System.Net.Http.HttpResponseMessage> SendToServer(string packet, string ip = "", string port = "3000")
         {
             if(string.IsNullOrWhiteSpace(ip))
             {

XamarinForms.VisualDebug.Core/TreeRenderer.cs

@@ -79,7 +79,7 @@ public static string RenderVisualHeirarchyToJson(VisualElement element)
 
         private static RenderRepresentation ToRenderRepresentation(VisualElement element)
         {
-            return new RenderRepresentation()
+            var rep = new RenderRepresentation()
             {
                 ElementId = element.Id,
                 VisualTypeName = element.GetType().Name,
@@ -95,6 +95,32 @@ private static RenderRepresentation ToRenderRepresentation(VisualElement element
                     Width = element.Bounds.Width
                 }
             };
+
+            if (element is View repv)
+            {
+                rep.Margin = new RenderThickness
+                {
+                    Left = repv.Margin.Left,
+                    Top = repv.Margin.Top,
+                    Right = repv.Margin.Right,
+                    Bottom = repv.Margin.Bottom
+                };
+            }
+
+            var paddingProp = element.GetType().GetProperty("Padding");
+            if (!(paddingProp is null))
+            {
+                var padding = (Thickness)paddingProp.GetValue(element);
+                rep.Padding = new RenderThickness
+                {
+                    Left   = padding.Left,
+                    Top    = padding.Top,
+                    Right  = padding.Right,
+                    Bottom = padding.Bottom
+                };
+            }
+
+            return rep;
         }
 
 

XamarinForms.VisualDebug.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>XamarinForms.VisualDebug</id>
     <title>XamarinForms.VisualDebug</title>
-    <version>0.0.1</version>
+    <version>0.0.2</version>
     <authors>David Thompson</authors>
     <owners>David Thompson</owners>
     <projectUrl>https://github.com/Pepsi1x1/XamarinForms.VisualDebug</projectUrl>

XamarinForms.VisualDebug/XamarinForms.VisualDebug/App.xaml.cs

@@ -30,7 +30,7 @@ private void Current_PageAppearing(object sender, Page e)
                     ip = XamarinForms.VisualDebug.Constants.IPConstant.LocalIP;
                 }
 
-                var response = await Sender.SendToServer(rep).ConfigureAwait(false);
+                var response = await Sender.SendToServer(rep, ip).ConfigureAwait(false);
                 if (response.IsSuccessStatusCode)
                 {
                     Console.WriteLine("Success!");

XamarinForms.VisualDebug/XamarinForms.VisualDebug/IPConstant.cs

@@ -8,7 +8,7 @@ namespace XamarinForms.VisualDebug.Constants
         public const string LocalIP =<# // This code runs in the text template:
         foreach (System.Net.NetworkInformation.NetworkInterface ni in System.Net.NetworkInformation.NetworkInterface.GetAllNetworkInterfaces())
         {
-            if (ni.NetworkInterfaceType == System.Net.NetworkInformation.NetworkInterfaceType.Ethernet)
+            if (ni.NetworkInterfaceType == System.Net.NetworkInformation.NetworkInterfaceType.Wireless80211)
             {
                 foreach (System.Net.NetworkInformation.UnicastIPAddressInformation ip in ni.GetIPProperties().UnicastAddresses)
                 {

XamarinForms.VisualDebug/XamarinForms.VisualDebug/IPConstant.tt

@@ -34,14 +34,6 @@
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="IPConstant.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>IPConstant.tt</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Update="RenderSamples.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>