Remove InternalsVisibleTo from Maps (#1019)

xamarin · Jul 24, 2017 · 171fa0f · 171fa0f
1 parent 6de1c5c
commit 171fa0f
Show file tree

Hide file tree

Showing 14 changed files with 150 additions and 74 deletions.
diff --git a/Xamarin.Forms.Core.UnitTests/MapTests.cs b/Xamarin.Forms.Core.UnitTests/MapTests.cs
@@ -120,7 +120,7 @@ public void VisibleRegion ()
 			bool signaled = false;
 			MessagingCenter.Subscribe<Map, MapSpan> (this, "MapMoveToRegion", (s, a) => {
 				signaled = true;
-				map.VisibleRegion = a;
+				map.SetVisibleRegion(a);
 			}, map);
 
 			map.MoveToRegion (new MapSpan (new Position (1, 2), 3, 4));
@@ -139,7 +139,7 @@ public void VisibleRegionDoubleSet ()
 					signaled = true;
 			};
 
-			map.VisibleRegion = map.VisibleRegion;
+			map.SetVisibleRegion(map.VisibleRegion);
 
 			Assert.False (signaled);
 		}

diff --git a/Xamarin.Forms.Maps.Android/MapRenderer.cs b/Xamarin.Forms.Maps.Android/MapRenderer.cs
@@ -385,7 +385,7 @@ void UpdateVisibleRegion(LatLng pos)
 			LatLng lr = projection.FromScreenLocation(new global::Android.Graphics.Point(width, height));
 			double dlat = Math.Max(Math.Abs(ul.Latitude - lr.Latitude), Math.Abs(ur.Latitude - ll.Latitude));
 			double dlong = Math.Max(Math.Abs(ul.Longitude - lr.Longitude), Math.Abs(ur.Longitude - ll.Longitude));
-			Element.VisibleRegion = new MapSpan(new Position(pos.Latitude, pos.Longitude), dlat, dlong);
+			Element.SetVisibleRegion(new MapSpan(new Position(pos.Latitude, pos.Longitude), dlat, dlong));
 		}
 
 		void IOnMapReadyCallback.OnMapReady(GoogleMap map)

diff --git a/Xamarin.Forms.Maps.UWP/MapRenderer.cs b/Xamarin.Forms.Maps.UWP/MapRenderer.cs
@@ -231,7 +231,7 @@ async Task UpdateVisibleRegion()
 					var longitudeDelta = Math.Abs(nw.Position.Longitude - se.Position.Longitude);
                     await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
                     {
-					    Element.VisibleRegion = new MapSpan(center, latitudeDelta, longitudeDelta);
+						Element.SetVisibleRegion(new MapSpan(center, latitudeDelta, longitudeDelta));
                     });
 				}
             }

diff --git a/Xamarin.Forms.Maps.WP8/MapRenderer.cs b/Xamarin.Forms.Maps.WP8/MapRenderer.cs
@@ -124,7 +124,7 @@ void UpdateVisibleRegion()
 
 			var boundingRegion = LocationRectangle.CreateBoundingRectangle(topLeft, bottomRight);
 			var result = new MapSpan(center, boundingRegion.HeightInDegrees, boundingRegion.WidthInDegrees);
-			Element.VisibleRegion = result;
+			Element.SetVisibleRegion(result);
 		}
 
 		void LoadPins()

diff --git a/Xamarin.Forms.Maps.WinRT.Tablet/MapRenderer.cs b/Xamarin.Forms.Maps.WinRT.Tablet/MapRenderer.cs
@@ -174,7 +174,7 @@ void UpdateVisibleRegion()
 
 			var boundingRegion = Control.Bounds;
 			var result = new MapSpan(center, boundingRegion.Height, boundingRegion.Width);
-			Element.VisibleRegion = result;
+			Element.SetVisibleRegion(result);
 		}
 
 		void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)

diff --git a/Xamarin.Forms.Maps.iOS/MapRenderer.cs b/Xamarin.Forms.Maps.iOS/MapRenderer.cs
@@ -346,7 +346,7 @@ void MkMapViewOnRegionChanged(object sender, MKMapViewChangeEventArgs mkMapViewC
 			var mapModel = (Map)Element;
 			var mkMapView = (MKMapView)Control;
 
-			mapModel.VisibleRegion = new MapSpan(new Position(mkMapView.Region.Center.Latitude, mkMapView.Region.Center.Longitude), mkMapView.Region.Span.LatitudeDelta, mkMapView.Region.Span.LongitudeDelta);
+			mapModel.SetVisibleRegion(new MapSpan(new Position(mkMapView.Region.Center.Latitude, mkMapView.Region.Center.Longitude), mkMapView.Region.Span.LatitudeDelta, mkMapView.Region.Span.LongitudeDelta));
 		}
 
 		void MoveToRegion(MapSpan mapSpan, bool animated = true)

diff --git a/Xamarin.Forms.Maps/Geocoder.cs b/Xamarin.Forms.Maps/Geocoder.cs
@@ -1,14 +1,17 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Threading.Tasks;
 
 namespace Xamarin.Forms.Maps
 {
 	public class Geocoder
 	{
-		internal static Func<string, Task<IEnumerable<Position>>> GetPositionsForAddressAsyncFunc;
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public static Func<string, Task<IEnumerable<Position>>> GetPositionsForAddressAsyncFunc;
 
-		internal static Func<Position, Task<IEnumerable<string>>> GetAddressesForPositionFuncAsync;
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public static Func<Position, Task<IEnumerable<string>>> GetAddressesForPositionFuncAsync;
 
 		public Task<IEnumerable<string>> GetAddressesForPositionAsync(Position position)
 		{

diff --git a/Xamarin.Forms.Maps/Map.cs b/Xamarin.Forms.Maps/Map.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
 
 namespace Xamarin.Forms.Maps
@@ -63,6 +64,8 @@ public IList<Pin> Pins
 			get { return _pins; }
 		}
 
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void SetVisibleRegion(MapSpan value) => VisibleRegion = value;
 		public MapSpan VisibleRegion
 		{
 			get { return _visibleRegion; }
@@ -78,7 +81,8 @@ internal set
 			}
 		}
 
-		internal MapSpan LastMoveToRegion { get; private set; }
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public MapSpan LastMoveToRegion { get; private set; }
 
 		IEnumerator IEnumerable.GetEnumerator()
 		{

diff --git a/Xamarin.Forms.Maps/Pin.cs b/Xamarin.Forms.Maps/Pin.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 
 namespace Xamarin.Forms.Maps
 {
@@ -37,7 +38,8 @@ public PinType Type
 		}
 
 		// introduced to store the unique id for Android markers
-		internal object Id { get; set; }
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public object Id { get; set; }
 
 		public event EventHandler Clicked;
 
@@ -74,7 +76,8 @@ public override int GetHashCode()
 			return !Equals(left, right);
 		}
 
-		internal bool SendTap()
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool SendTap()
 		{
 			EventHandler handler = Clicked;
 			if (handler == null)

diff --git a/Xamarin.Forms.Maps/Properties/AssemblyInfo.cs b/Xamarin.Forms.Maps/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
 using System.Reflection;
 using System.Resources;
-using System.Runtime.CompilerServices;
-using Xamarin.Forms;
 using Xamarin.Forms.Internals;
 
 // General Information about an assembly is controlled through the following 
@@ -13,19 +11,4 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Maps.macOS")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Maps.iOS")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Maps.iOS.Classic")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Maps.Android")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Maps.WP8")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Maps.UWP")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Maps.WinRT.Phone")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Maps.WinRT.Tablet")]
-[assembly: InternalsVisibleTo("iOSUnitTests")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Core.UnitTests")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Core.Android.UnitTests")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Core.WP8.UnitTests")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Xaml.UnitTests")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Xaml")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Maps.Design")]
 [assembly: Preserve]
diff --git a/docs/Xamarin.Forms.Maps/Xamarin.Forms.Maps/Geocoder.xml b/docs/Xamarin.Forms.Maps/Xamarin.Forms.Maps/Geocoder.xml
@@ -62,6 +62,26 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="GetAddressesForPositionFuncAsync">
+      <MemberSignature Language="C#" Value="public static Func&lt;Xamarin.Forms.Maps.Position,System.Threading.Tasks.Task&lt;System.Collections.Generic.IEnumerable&lt;string&gt;&gt;&gt; GetAddressesForPositionFuncAsync;" />
+      <MemberSignature Language="ILAsm" Value=".field public static class System.Func`2&lt;valuetype Xamarin.Forms.Maps.Position, class System.Threading.Tasks.Task`1&lt;class System.Collections.Generic.IEnumerable`1&lt;string&gt;&gt;&gt; GetAddressesForPositionFuncAsync" />
+      <MemberType>Field</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>2.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>System.Func&lt;Xamarin.Forms.Maps.Position,System.Threading.Tasks.Task&lt;System.Collections.Generic.IEnumerable&lt;System.String&gt;&gt;&gt;</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>For internal use by the Xamarin.Forms platform.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="GetPositionsForAddressAsync">
       <MemberSignature Language="C#" Value="public System.Threading.Tasks.Task&lt;System.Collections.Generic.IEnumerable&lt;Xamarin.Forms.Maps.Position&gt;&gt; GetPositionsForAddressAsync (string address);" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Threading.Tasks.Task`1&lt;class System.Collections.Generic.IEnumerable`1&lt;valuetype Xamarin.Forms.Maps.Position&gt;&gt; GetPositionsForAddressAsync(string address) cil managed" />
@@ -87,5 +107,25 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="GetPositionsForAddressAsyncFunc">
+      <MemberSignature Language="C#" Value="public static Func&lt;string,System.Threading.Tasks.Task&lt;System.Collections.Generic.IEnumerable&lt;Xamarin.Forms.Maps.Position&gt;&gt;&gt; GetPositionsForAddressAsyncFunc;" />
+      <MemberSignature Language="ILAsm" Value=".field public static class System.Func`2&lt;string, class System.Threading.Tasks.Task`1&lt;class System.Collections.Generic.IEnumerable`1&lt;valuetype Xamarin.Forms.Maps.Position&gt;&gt;&gt; GetPositionsForAddressAsyncFunc" />
+      <MemberType>Field</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>2.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>System.Func&lt;System.String,System.Threading.Tasks.Task&lt;System.Collections.Generic.IEnumerable&lt;Xamarin.Forms.Maps.Position&gt;&gt;&gt;</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>For internal use by the Xamarin.Forms platform.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/docs/Xamarin.Forms.Maps/Xamarin.Forms.Maps/Map.xml b/docs/Xamarin.Forms.Maps/Xamarin.Forms.Maps/Map.xml
@@ -230,6 +230,27 @@ var cp = new ContentPage {
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="LastMoveToRegion">
+      <MemberSignature Language="C#" Value="public Xamarin.Forms.Maps.MapSpan LastMoveToRegion { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance class Xamarin.Forms.Maps.MapSpan LastMoveToRegion" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>2.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>Xamarin.Forms.Maps.MapSpan</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>For internal use by the Xamarin.Forms platform.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="MapType">
       <MemberSignature Language="C#" Value="public Xamarin.Forms.Maps.MapType MapType { get; set; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Forms.Maps.MapType MapType" />
@@ -316,6 +337,30 @@ var cp = new ContentPage {
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="SetVisibleRegion">
+      <MemberSignature Language="C#" Value="public void SetVisibleRegion (Xamarin.Forms.Maps.MapSpan value);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void SetVisibleRegion(class Xamarin.Forms.Maps.MapSpan value) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>2.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="Xamarin.Forms.Maps.MapSpan" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>For internal use by the Xamarin.Forms platform.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="System.Collections.IEnumerable.GetEnumerator">
       <MemberSignature Language="C#" Value="System.Collections.IEnumerator IEnumerable.GetEnumerator ();" />
       <MemberSignature Language="ILAsm" Value=".method hidebysig newslot virtual instance class System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() cil managed" />

diff --git a/docs/Xamarin.Forms.Maps/Xamarin.Forms.Maps/Pin.xml b/docs/Xamarin.Forms.Maps/Xamarin.Forms.Maps/Pin.xml
@@ -170,6 +170,27 @@ public static Page GetMapPage ()
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="Id">
+      <MemberSignature Language="C#" Value="public object Id { get; set; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance object Id" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>2.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>System.Object</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>For internal use by the Xamarin.Forms platform.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Label">
       <MemberSignature Language="C#" Value="public string Label { get; set; }" />
       <MemberSignature Language="ILAsm" Value=".property instance string Label" />
@@ -303,6 +324,28 @@ public static Page GetMapPage ()
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="SendTap">
+      <MemberSignature Language="C#" Value="public bool SendTap ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool SendTap() cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>2.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>For internal use by the Xamarin.Forms platform.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Type">
       <MemberSignature Language="C#" Value="public Xamarin.Forms.Maps.PinType Type { get; set; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Forms.Maps.PinType Type" />

diff --git a/docs/Xamarin.Forms.Maps/index.xml b/docs/Xamarin.Forms.Maps/index.xml
@@ -35,51 +35,6 @@
         <Attribute>
           <AttributeName>System.Runtime.CompilerServices.CompilationRelaxations(8)</AttributeName>
         </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Maps.macOS")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Maps.iOS")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Maps.iOS.Classic")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Maps.Android")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Maps.WP8")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Maps.UWP")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Maps.WinRT.Phone")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Maps.WinRT.Tablet")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("iOSUnitTests")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Core.UnitTests")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Core.Android.UnitTests")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Core.WP8.UnitTests")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Xaml.UnitTests")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Xaml")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Maps.Design")</AttributeName>
-        </Attribute>
         <Attribute>
           <AttributeName>System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true)</AttributeName>
         </Attribute>