From e6d5186c8acbf37b877c7ca3c77a378352a3743d Mon Sep 17 00:00:00 2001 From: kingces95 Date: Tue, 7 Mar 2017 14:56:24 -0500 Subject: Remove InternalsVisibleTo from Core to XF.Platforms.* (#782) * Remove InternalsVisibleTo from Core to XF.Platforms.* * Changes per Jason's code review * Move LockableObservableListWrapper to internals namespace * Changes per Stephane's code review * update docs * Touch code to get CI to run tests * Rebase; Update documentation --- Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs | 11 ++++++----- .../AppCompat/CarouselPageRenderer.cs | 4 ++-- .../AppCompat/FormsAppCompatActivity.cs | 7 +++++-- .../AppCompat/FormsFragmentPagerAdapter.cs | 1 + Xamarin.Forms.Platform.Android/AppCompat/Platform.cs | 1 + 5 files changed, 15 insertions(+), 9 deletions(-) (limited to 'Xamarin.Forms.Platform.Android/AppCompat') diff --git a/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs index aef56e11..61552f54 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs @@ -7,6 +7,7 @@ using Android.Graphics.Drawables; using Android.Support.V4.Content; using Android.Support.V7.Widget; using Android.Util; +using Xamarin.Forms.Internals; using GlobalResource = Android.Resource; using Object = Java.Lang.Object; using AView = Android.Views.View; @@ -31,12 +32,12 @@ namespace Xamarin.Forms.Platform.Android.AppCompat global::Android.Widget.Button NativeButton => Control; - void IOnAttachStateChangeListener.OnViewAttachedToWindow(AView attachedView) + void AView.IOnAttachStateChangeListener.OnViewAttachedToWindow(AView attachedView) { UpdateText(); } - void IOnAttachStateChangeListener.OnViewDetachedFromWindow(AView detachedView) + void AView.IOnAttachStateChangeListener.OnViewDetachedFromWindow(AView detachedView) { } @@ -161,7 +162,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat } catch (Exception ex) { - Log.Warning("Xamarin.Forms.Platform.Android.ButtonRenderer", "Could not retrieve button background resource: {0}", ex); + Internals.Log.Warning("Xamarin.Forms.Platform.Android.ButtonRenderer", "Could not retrieve button background resource: {0}", ex); Control.SupportBackgroundTintList = new ColorStateList(ColorExtensions.States, new[] { (int)0xffd7d6d6, 0x7fd7d6d6 }); } } @@ -289,7 +290,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat _textColorSwitcher?.UpdateTextColor(Control, Element.TextColor); } - class ButtonClickListener : Object, IOnClickListener + class ButtonClickListener : Object, AView.IOnClickListener { #region Statics @@ -304,7 +305,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat } } - class ButtonTouchListener : Object, IOnTouchListener + class ButtonTouchListener : Object, AView.IOnTouchListener { public static readonly Lazy Instance = new Lazy(() => new ButtonTouchListener()); diff --git a/Xamarin.Forms.Platform.Android/AppCompat/CarouselPageRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/CarouselPageRenderer.cs index fb6d5b55..f7a48d9b 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/CarouselPageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/CarouselPageRenderer.cs @@ -91,13 +91,13 @@ namespace Xamarin.Forms.Platform.Android.AppCompat { OverScrollMode = OverScrollMode.Never, EnableGesture = true, - LayoutParameters = new LayoutParams(LayoutParams.MatchParent, LayoutParams.MatchParent), + LayoutParameters = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MatchParent, ViewGroup.LayoutParams.MatchParent), Adapter = new FormsFragmentPagerAdapter(e.NewElement, activity.SupportFragmentManager) { CountOverride = e.NewElement.Children.Count } }; pager.Id = FormsAppCompatActivity.GetUniqueId(); pager.AddOnPageChangeListener(this); - AddView(pager); + ViewGroup.AddView(pager); CarouselPage carouselPage = e.NewElement; if (carouselPage.CurrentPage != null) ScrollToCurrentPage(); diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs index 223d3a83..4d588218 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs @@ -21,6 +21,7 @@ using AToolbar = Android.Support.V7.Widget.Toolbar; using AColor = Android.Graphics.Color; using AlertDialog = Android.Support.V7.App.AlertDialog; using ARelativeLayout = Android.Widget.RelativeLayout; +using Xamarin.Forms.Internals; #endregion @@ -56,6 +57,8 @@ namespace Xamarin.Forms.Platform.Android _currentState = AndroidApplicationLifecycleState.Uninitialized; } + IApplicationController Controller => _application; + public event EventHandler ConfigurationChanged; int IStartActivityForResult.RegisterActivityResultCallback(Action callback) @@ -126,7 +129,7 @@ namespace Xamarin.Forms.Platform.Android _application = application; (application as IApplicationController)?.SetAppIndexingProvider(new AndroidAppIndexProvider(this)); - Xamarin.Forms.Application.Current = application; + Xamarin.Forms.Application.SetCurrentApplication(application); SetSoftInputMode(); @@ -354,7 +357,7 @@ namespace Xamarin.Forms.Platform.Android } catch (Exception ex) { - Log.Warning("Xamarin.Forms.Platform.Android.FormsAppCompatActivity", "Error retrieving color resource: {0}", ex); + Internals.Log.Warning("Xamarin.Forms.Platform.Android.FormsAppCompatActivity", "Error retrieving color resource: {0}", ex); } return -1; diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsFragmentPagerAdapter.cs b/Xamarin.Forms.Platform.Android/AppCompat/FormsFragmentPagerAdapter.cs index 99fbb396..968695df 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/FormsFragmentPagerAdapter.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/FormsFragmentPagerAdapter.cs @@ -1,6 +1,7 @@ using Android.OS; using Android.Support.V4.App; using Java.Lang; +using Xamarin.Forms.Internals; namespace Xamarin.Forms.Platform.Android.AppCompat { diff --git a/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs b/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs index eb23c4de..69365c63 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs @@ -6,6 +6,7 @@ using Android.Content; using Android.Views; using Android.Views.Animations; using ARelativeLayout = Android.Widget.RelativeLayout; +using Xamarin.Forms.Internals; namespace Xamarin.Forms.Platform.Android.AppCompat { -- cgit v1.2.3