Android fastrenderers

AndroidNative/FormsViewGroup/src/com/xamarin/forms/platform/android/FormsViewGroup.java

@@ -93,4 +93,134 @@ public void sendBatchUpdate (
 		setTranslationX (translationX);
 		setTranslationY (translationY);
 	}
+
+	package com.xamarin.forms.platform.android;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.ViewGroup;
+import android.view.*;
+
+
+public class FormsViewGroup extends ViewGroup {
+
+	public FormsViewGroup(Context context) {
+		super(context);
+		// TODO Auto-generated constructor stub
+	}
+
+	public FormsViewGroup(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		// TODO Auto-generated constructor stub
+	}
+
+	public FormsViewGroup(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		// TODO Auto-generated constructor stub
+	}
+
+	public void measureAndLayout (int widthMeasureSpec, int heightMeasureSpec, int l, int t, int r, int b)
+	{
+		measure (widthMeasureSpec, heightMeasureSpec);
+		layout (l, t, r, b);
+	}
+
+	@Override
+	protected void onLayout(boolean changed, int l, int t, int r, int b) {
+	}
+
+	boolean inputTransparent;
+
+	protected void setInputTransparent (boolean value)
+	{
+		inputTransparent = value;
+	}
+
+	protected boolean getInputTransparent ()
+	{
+		return inputTransparent;
+	}
+
+	@Override
+	public boolean onInterceptTouchEvent (MotionEvent ev)
+	{
+		if (inputTransparent)
+			return false;
+
+		return super.onInterceptTouchEvent(ev);
+	}
+
+	@Override
+	public boolean onTouchEvent (MotionEvent ev)
+	{
+		if (inputTransparent)
+			return false;
+
+		return super.onTouchEvent(ev);
+	}
+
+	public void sendBatchUpdate (
+			float pivotX,
+			float pivotY,
+			int visibility,
+			boolean enabled,
+			float opacity,
+			float rotation, 
+			float rotationX, 
+			float rotationY,
+			float scale,
+			float translationX,
+			float translationY){
+		setPivotX (pivotX);
+		setPivotY (pivotY);
+
+		if (getVisibility () != visibility)
+			setVisibility (visibility);
+
+		if (isEnabled () != enabled)
+			setEnabled (enabled);
+
+		setAlpha (opacity);
+		setRotation (rotation);
+		setRotationX (rotationX);
+		setRotationY (rotationY);
+		setScaleX (scale);
+		setScaleY (scale);
+		setTranslationX (translationX);
+		setTranslationY (translationY);
+	}
+
+	public static void sendViewBatchUpdate (
+			View view,
+			float pivotX,
+			float pivotY,
+			int visibility,
+			boolean enabled,
+			float opacity,
+			float rotation,
+			float rotationX,
+			float rotationY,
+			float scale,
+			float translationX,
+			float translationY){
+		view.setPivotX (pivotX);
+		view.setPivotY (pivotY);
+
+		if (view.getVisibility () != visibility)
+			view.setVisibility (visibility);
+
+		if (view.isEnabled () != enabled)
+			view.setEnabled (enabled);
+
+		view.setAlpha (opacity);
+		view.setRotation (rotation);
+		view.setRotationX (rotationX);
+		view.setRotationY (rotationY);
+		view.setScaleX (scale);
+		view.setScaleY (scale);
+		view.setTranslationX (translationX);
+		view.setTranslationY (translationY);
+	}
+}
+
 }

Stubs/Xamarin.Forms.Platform.cs

@@ -34,11 +34,18 @@ internal class _EntryRenderer { }
 
 	[RenderWith (typeof (EditorRenderer))]
 	internal class _EditorRenderer { }
-
+#if __ANDROID__
+	[RenderWith (typeof (Xamarin.Forms.Platform.Android.FastRenderers.LabelRenderer))]
+#else
 	[RenderWith (typeof (LabelRenderer))]
+#endif
 	internal class _LabelRenderer { }
 
+#if __ANDROID__
+	[RenderWith(typeof(Xamarin.Forms.Platform.Android.FastRenderers.ImageRenderer))]
+#else
 	[RenderWith (typeof (ImageRenderer))]
+#endif
 	internal class _ImageRenderer { }
 
 	[RenderWith (typeof (ButtonRenderer))]

Xamarin.Forms.ControlGallery.Android/Activity1.cs

@@ -1,28 +1,20 @@
 using System;
-using System.ComponentModel;
 using System.Diagnostics;
-using System.Reflection;
-
+using System.Globalization;
+using System.IO;
+using System.IO.IsolatedStorage;
 using Android.App;
-using Android.Content;
 using Android.Content.PM;
-using Android.Runtime;
-using Android.Views;
-using Android.Widget;
 using Android.OS;
+using Android.Widget;
+using Java.Interop;
 using Xamarin.Forms;
 using Xamarin.Forms.ControlGallery.Android;
 using Xamarin.Forms.Controls;
-using Xamarin.Forms.Maps.Android;
+using Xamarin.Forms.Controls.Issues;
 using Xamarin.Forms.Platform.Android;
 using Xamarin.Forms.Platform.Android.AppLinks;
-using System.IO;
-using System.IO.IsolatedStorage;
-
-using Droid = Android;
-using System.Globalization;
-using Java.Interop;
-using Xamarin.Forms.Controls.Issues;
+using Android.Content;
 
 [assembly: Dependency (typeof (CacheService))]
 [assembly: Dependency (typeof (TestCloudService))]
@@ -34,29 +26,7 @@
 
 namespace Xamarin.Forms.ControlGallery.Android
 {
-	public class BorderEffect : PlatformEffect
-	{
-		protected override void OnAttached ()
-		{
-			Control.SetBackgroundColor (global::Android.Graphics.Color.Aqua);
-
-			var childLabel = (Element as ScrollView)?.Content as Label;
-			if (childLabel != null)
-				childLabel.Text = "Success";
-		}
-
-		protected override void OnDetached ()
-		{
-			Control.SetBackgroundColor(global::Android.Graphics.Color.Beige);
-		}
-
-		protected override void OnElementPropertyChanged (PropertyChangedEventArgs args)
-		{
-			base.OnElementPropertyChanged (args);
-		}
-	}
-
-	public class CacheService : ICacheService
+    public class CacheService : ICacheService
 	{
 		public void ClearImageCache ()
 		{

Xamarin.Forms.ControlGallery.Android/BorderEffect.cs

@@ -0,0 +1,21 @@
+using Xamarin.Forms.Platform.Android;
+
+namespace Xamarin.Forms.ControlGallery.Android
+{
+    public class BorderEffect : PlatformEffect
+    {
+        protected override void OnAttached ()
+        {
+            Control.SetBackgroundColor (global::Android.Graphics.Color.Aqua);
+
+            var childLabel = (Element as ScrollView)?.Content as Label;
+            if (childLabel != null)
+                childLabel.Text = "Success";
+        }
+
+        protected override void OnDetached ()
+        {
+            Control.SetBackgroundColor(global::Android.Graphics.Color.Beige);
+        }
+    }
+}

Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs

@@ -2,6 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Android.App;
+using Xamarin.Forms;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -35,3 +36,10 @@
 
 [assembly: Android.App.MetaData("com.google.android.maps.v2.API_KEY", Value = "AIzaSyAdstcJQswxEjzX5YjLaMcu2aRVEBJw39Y")]
 [assembly: Xamarin.Forms.ResolutionGroupName ("XamControl")]
+
+#if TEST_LEGACY_RENDERERS
+[assembly: ExportRenderer(typeof(Button), typeof(Xamarin.Forms.Platform.Android.AppCompat.ButtonRenderer))]
+[assembly: ExportRenderer(typeof(Image), typeof(Xamarin.Forms.Platform.Android.ImageRenderer))]
+[assembly: ExportRenderer(typeof(Label), typeof(Xamarin.Forms.Platform.Android.LabelRenderer))]
+[assembly: ExportRenderer(typeof(Frame), typeof(Xamarin.Forms.Platform.Android.AppCompat.FrameRenderer))]
+#endif

Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj

@@ -168,6 +168,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Activity1.cs" />
+    <Compile Include="BorderEffect.cs" />
     <Compile Include="BrokenNativeControl.cs" />
     <Compile Include="Properties\MapsKey.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs

@@ -2,7 +2,6 @@
 using System.Drawing;
 using System.Globalization;
 using System.IO;
-using AdvancedColorPicker;
 using CoreGraphics;
 using Foundation;
 using UIKit;
@@ -328,7 +327,7 @@ void AddNativeBindings(NativeBindingGalleryPage page)
 			uiView.Add(uilabel);
 			sl?.Children.Add(uiView);
 			sl?.Children.Add(uibuttonColor.ToView());
-			var colorPicker = new ColorPickerView(new CGRect(0, 0, width, 300));
+			var colorPicker = new AdvancedColorPicker.ColorPickerView(new CGRect(0, 0, width, 300));
 			colorPicker.SetBinding("SelectedColor", new Binding("NativeLabelColor", BindingMode.TwoWay, nativeColorConverter), "ColorPicked");
 			sl?.Children.Add(colorPicker);
 			page.NativeControlsAdded = true;

Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj

@@ -193,7 +193,7 @@
       <IsAppExtension>false</IsAppExtension>
     </ProjectReference>
     <ProjectReference Include="..\Stubs\Xamarin.Forms.Platform.iOS\Xamarin.Forms.Platform.iOS %28Forwarders%29.csproj">
-      <Project>{39B3457F-01D8-43D0-8E84-D8C4F73CF48D}</Project>
+      <Project>{39b3457f-01d8-43d0-8e84-d8c4f73cf48d}</Project>
       <Name>Xamarin.Forms.Platform.iOS (Forwarders)</Name>
     </ProjectReference>
   </ItemGroup>
@@ -295,6 +295,10 @@
     <BundleResource Include="coffee.png" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="AdvancedColorPicker, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AdvancedColorPicker.2.0.1\lib\Xamarin.iOS\AdvancedColorPicker.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -308,9 +312,6 @@
     <Reference Include="Calabash">
       <HintPath>..\packages\Xamarin.TestCloud.Agent.0.20.3\lib\Xamarin.iOS10\Calabash.dll</HintPath>
     </Reference>
-    <Reference Include="AdvancedColorPicker">
-      <HintPath>..\packages\AdvancedColorPicker.2.0.1\lib\Xamarin.iOS\AdvancedColorPicker.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
@@ -320,8 +321,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
   </Target>
-  <ItemGroup>
-    <Folder Include="Resources\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="..\packages\Xamarin.Insights.1.12.3\build\Xamarin.iOS10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.12.3\build\Xamarin.iOS10\Xamarin.Insights.targets')" />
 </Project>

Xamarin.Forms.Core.UITests.Shared/Remotes/BaseViewContainerRemote.cs

@@ -125,10 +125,16 @@ public T GetProperty<T>(BindableProperty formProperty)
 			bool isOnParentRenderer = property.Item2;
 
 			var query = ViewQuery;
-			if (isOnParentRenderer &&
-				PlatformViewType != PlatformViews.BoxView &&
-				PlatformViewType != PlatformViews.Frame)
-			{
+			if (isOnParentRenderer && 
+				PlatformViewType != PlatformViews.BoxView && 
+				PlatformViewType != PlatformViews.Frame
+#if __ANDROID__
+				&&
+				PlatformViewType != PlatformViews.Button &&
+				PlatformViewType != PlatformViews.Label &&
+				PlatformViewType != PlatformViews.Image
+#endif               
+				) {
 				query = query + " parent * index:0";
 			}
 

Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs

@@ -17,7 +17,7 @@
 
 namespace Xamarin.Forms.Platform.Android.AppCompat
 {
-	public class ButtonRenderer : ViewRenderer<Button, AppCompatButton>, AView.IOnAttachStateChangeListener
+    public class ButtonRenderer : ViewRenderer<Button, AppCompatButton>, AView.IOnAttachStateChangeListener
 	{
 		TextColorSwitcher _textColorSwitcher;
 		float _defaultFontSize;

Xamarin.Forms.Platform.Android/AppCompat/CarouselPageRenderer.cs

@@ -42,7 +42,7 @@ protected override void Dispose(bool disposing)
 					IVisualElementRenderer pageRenderer = Android.Platform.GetRenderer(pageToRemove);
 					if (pageRenderer != null)
 					{
-						pageRenderer.ViewGroup.RemoveFromParent();
+						pageRenderer.View.RemoveFromParent();
 						pageRenderer.Dispose();
 					}
 					pageToRemove.ClearValue(Android.Platform.RendererProperty);

Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs

@@ -115,8 +115,8 @@ protected void LoadApplication(Application application)
 				RegisterHandlerForDefaultRenderer(typeof(NavigationPage), typeof(NavigationPageRenderer), typeof(NavigationRenderer));
 				RegisterHandlerForDefaultRenderer(typeof(TabbedPage), typeof(TabbedPageRenderer), typeof(TabbedRenderer));
 				RegisterHandlerForDefaultRenderer(typeof(MasterDetailPage), typeof(MasterDetailPageRenderer), typeof(MasterDetailRenderer));
-				RegisterHandlerForDefaultRenderer(typeof(Button), typeof(AppCompat.ButtonRenderer), typeof(ButtonRenderer));
-				RegisterHandlerForDefaultRenderer(typeof(Switch), typeof(AppCompat.SwitchRenderer), typeof(SwitchRenderer));
+				RegisterHandlerForDefaultRenderer(typeof(Button), typeof(FastRenderers.ButtonRenderer), typeof(ButtonRenderer));
+                RegisterHandlerForDefaultRenderer(typeof(Switch), typeof(AppCompat.SwitchRenderer), typeof(SwitchRenderer));
 				RegisterHandlerForDefaultRenderer(typeof(Picker), typeof(AppCompat.PickerRenderer), typeof(PickerRenderer));
 				RegisterHandlerForDefaultRenderer(typeof(Frame), typeof(AppCompat.FrameRenderer), typeof(FrameRenderer));
 				RegisterHandlerForDefaultRenderer(typeof(CarouselPage), typeof(AppCompat.CarouselPageRenderer), typeof(CarouselPageRenderer));

Xamarin.Forms.Platform.Android/AppCompat/FragmentContainer.cs

@@ -83,9 +83,9 @@ public override void OnDestroyView()
 			{
 				if (_visualElementRenderer != null)
 				{
-					if (_visualElementRenderer.ViewGroup.Handle != IntPtr.Zero)
+					if (_visualElementRenderer.View.Handle != IntPtr.Zero)
 					{
-						_visualElementRenderer.ViewGroup.RemoveFromParent();
+						_visualElementRenderer.View.RemoveFromParent();
 					}
 
 					_visualElementRenderer.Dispose();