diff options
17 files changed, 16 insertions, 440 deletions
diff --git a/Stubs/Xamarin.Forms.Platform.cs b/Stubs/Xamarin.Forms.Platform.cs index 5f3de257..4c828666 100644 --- a/Stubs/Xamarin.Forms.Platform.cs +++ b/Stubs/Xamarin.Forms.Platform.cs @@ -83,13 +83,6 @@ namespace Xamarin.Forms.Platform [RenderWith (typeof (ScrollViewRenderer))] internal class _ScrollViewRenderer { } -#if !WINDOWS_PHONE && !WINDOWS_PHONE_APP - [RenderWith (typeof (ToolbarRenderer))] -#else - [RenderWith (null)] -#endif - internal class _ToolbarRenderer { } - [RenderWith (typeof (ActivityIndicatorRenderer))] internal class _ActivityIndicatorRenderer { } diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2191.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2191.cs deleted file mode 100644 index b334030f..00000000 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2191.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; - -using Xamarin.Forms; -using Xamarin.Forms.CustomAttributes; - -namespace Xamarin.Forms.Controls -{ - [Preserve (AllMembers=true)] - [Issue (IssueTracker.Github, 2191, "ToolBarItem not showing as disabled when CanExecute is set to false", PlatformAffected.Android)] - public class Issue2191 : ContentPage - { - public Issue2191 () - { - var stackPanel = new StackLayout { VerticalOptions = LayoutOptions.End }; - var button = new Button { Text = "Disable" }; - var button1 = new Button { Text = "Enable" }; - button1.Clicked+= (sender, e) => { - _dummyResult = true; - PunchSubmitCommand.ChangeCanExecute(); - }; - var tbItem = new ToolbarItem { Icon = "menuIcon.png" }; - var tbItem2 = new ToolbarItem { Icon = "menuIcon.png", Text="submit" }; - button.SetBinding (Button.CommandProperty, new Binding ("PunchSubmitCommand")); - tbItem.SetBinding (MenuItem.CommandProperty, new Binding ("PunchSubmitCommand")); - tbItem2.SetBinding (MenuItem.CommandProperty, new Binding ("PunchSubmitCommand")); - button.BindingContext = tbItem.BindingContext = tbItem2.BindingContext = this; - ToolbarItems.Add(tbItem); - var toolbar = new Toolbar { BackgroundColor = Color.Red }; - toolbar.Add (tbItem2); - stackPanel.Children.Add (toolbar); - stackPanel.Children.Add (button); - stackPanel.Children.Add (button1); - Content = stackPanel; - } - - bool _dummyResult = true; - - Command _punchSubmitCommand; - public Command PunchSubmitCommand - { - get - { - return _punchSubmitCommand ?? (_punchSubmitCommand = new Command(() => { - _dummyResult = !_dummyResult; - PunchSubmitCommand.ChangeCanExecute(); - }, - () => _dummyResult)); - } - } - } -} diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems index 5f0ad474..913a3e69 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems @@ -245,7 +245,6 @@ <Compile Include="$(MSBuildThisFileDirectory)Issue206.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Issue214.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Issue2143.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Issue2191.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Issue2222.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Issue22246_BZ.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Issue2241.cs" /> diff --git a/Xamarin.Forms.Controls/CoreGallery.cs b/Xamarin.Forms.Controls/CoreGallery.cs index d060fbbc..99e27601 100644 --- a/Xamarin.Forms.Controls/CoreGallery.cs +++ b/Xamarin.Forms.Controls/CoreGallery.cs @@ -290,7 +290,6 @@ namespace Xamarin.Forms.Controls new TableViewGallery { Title = "TableView Gallery - Legacy" }, new TemplatedCarouselGallery { Title = "TemplatedCarouselPage Gallery - Legacy" }, new TemplatedTabbedGallery { Title = "TemplatedTabbedPage Gallery - Legacy" }, - new ToolbarGallery { Title = "Toolbar Gallery - Legacy" }, new UnevenViewCellGallery { Title = "UnevenViewCell Gallery - Legacy" }, new UnevenListGallery { Title = "UnevenList Gallery - Legacy" }, new ViewCellGallery { Title = "ViewCell Gallery - Legacy" }, diff --git a/Xamarin.Forms.Controls/GalleryPages/ToolbarGallery.cs b/Xamarin.Forms.Controls/GalleryPages/ToolbarGallery.cs deleted file mode 100644 index b2be5f02..00000000 --- a/Xamarin.Forms.Controls/GalleryPages/ToolbarGallery.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Xamarin.Forms.Controls -{ - public class ToolbarGallery : ContentPage - { - readonly Toolbar _toolbar; - readonly StackLayout _stack; - - public ToolbarGallery () - { - var label = new Label { - Text = "Click the toolbar" - }; - - Content = _stack = new StackLayout (); - _stack.Children.Add (label); - - foreach (string name in new[] { "One", "Two", "Three", "Four" }) { - var toolbarItem = new ToolbarItem (name, null, delegate { - label.Text = "Activated: " + name; - }, ToolbarItemOrder.Secondary); - ToolbarItems.Add (toolbarItem); - } - - var imagePrimaryItem = new ToolbarItem (null, "menuIcon.png", () => label.Text = "Activated: Primary Image 1", ToolbarItemOrder.Primary); - var imagePrimaryItemWithTitle = new ToolbarItem ("Primary", "menuIcon.png", () => label.Text = "Activated: Primary Image 2", ToolbarItemOrder.Primary); - var imageItem = new ToolbarItem (null, "seth.png", () => label.Text = "Activated: Secondary Image 1", ToolbarItemOrder.Secondary); - var imageItemWithTitle = new ToolbarItem ("Secondary", "seth.png", () => label.Text = "Activated: Secondary Image 2", ToolbarItemOrder.Secondary); - ToolbarItems.Add (imagePrimaryItem); - ToolbarItems.Add (imagePrimaryItemWithTitle); - ToolbarItems.Add (imageItem); - ToolbarItems.Add (imageItemWithTitle); - } - } -} diff --git a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj index 3252403b..7e0f30f3 100644 --- a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj +++ b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj @@ -211,7 +211,6 @@ <Compile Include="GalleryPages\TableViewGallery.cs" /> <Compile Include="GalleryPages\TemplatedCarouselGallery.cs" /> <Compile Include="GalleryPages\TemplatedTabbedGallery.cs" /> - <Compile Include="GalleryPages\ToolbarGallery.cs" /> <Compile Include="GalleryPages\UnevenListGallery.cs" /> <Compile Include="GalleryPages\WebViewGallery.cs" /> <Compile Include="GalleryPages\StyleGallery.cs" /> diff --git a/Xamarin.Forms.Core.UnitTests/ToolbarUnitTests.cs b/Xamarin.Forms.Core.UnitTests/ToolbarUnitTests.cs deleted file mode 100644 index efe07ebf..00000000 --- a/Xamarin.Forms.Core.UnitTests/ToolbarUnitTests.cs +++ /dev/null @@ -1,144 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -using NUnit.Framework; - -namespace Xamarin.Forms.Core.UnitTests -{ - [TestFixture] - public class ToolbarUnitTests : BaseTestFixture - { - [Test] - public void TestConstructor () - { - Toolbar toolbar = new Toolbar (); - - Assert.That (toolbar.Items, Is.Empty); - } - - [Test] - public void TestAdd () - { - Toolbar toolbar = new Toolbar (); - - ToolbarItem item = new ToolbarItem ("Foo", "Bar.jpg", () => {}); - toolbar.Add (item); - - Assert.AreEqual (item, toolbar.Items [0]); - } - - [Test] - public void TestRemove () - { - Toolbar toolbar = new Toolbar (); - - ToolbarItem item = new ToolbarItem ("Foo", "Bar.jpg", () => {}); - ToolbarItem item2 = new ToolbarItem ("Foo", "Bar.jpg", () => {}); - toolbar.Add (item); - toolbar.Add (item2); - - toolbar.Remove (item); - - Assert.AreEqual (item2, toolbar.Items [0]); - } - - [Test] - public void TestItemAdded () - { - Toolbar toolbar = new Toolbar (); - - ToolbarItem item = new ToolbarItem ("Foo", "Bar.jpg", () => {}); - - bool added = false; - toolbar.ItemAdded += (sender, e) => added = true; - - toolbar.Add (item); - - Assert.True (added); - - added = false; - toolbar.Add (item); - - Assert.False (added); - } - - [Test] - public void TestItemRemoved () - { - Toolbar toolbar = new Toolbar (); - - ToolbarItem item = new ToolbarItem ("Foo", "Bar.jpg", () => {}); - toolbar.Add (item); - - bool removed = false; - toolbar.ItemRemoved += (sender, e) => removed = true; - - toolbar.Remove (item); - - Assert.True (removed); - } - - [Test] - public void TestClear () - { - var toolbar = new Toolbar (); - - var item = new ToolbarItem ("Foo", "Bar.jpg", () => {}); - var item2 = new ToolbarItem ("Foo", "Bar.jpg", () => {}); - - toolbar.Add (item); - toolbar.Add (item2); - - toolbar.Clear (); - - Assert.That (toolbar.Items, Is.Empty); - } - - [Test] - public void ToolBarItemAddedEventArgs () - { - var toolbar = new Toolbar (); - - var item = new ToolbarItem ("Foo", "Bar.jpg", () => { }); - var item2 = new ToolbarItem ("Foo", "Bar.jpg", () => { }); - - ToolbarItem itemArg = null; - - toolbar.ItemAdded += (s, e) => { - itemArg = e.ToolbarItem; - }; - - toolbar.Add (item); - Assert.AreEqual (item, itemArg); - - toolbar.Add (item2); - Assert.AreEqual (item2, itemArg); - } - - [Test] - public void ToolBarItemRemovedEventArgs () - { - var toolbar = new Toolbar (); - - var item = new ToolbarItem ("Foo", "Bar.jpg", () => { }); - var item2 = new ToolbarItem ("Foo", "Bar.jpg", () => { }); - - toolbar.Add (item); - toolbar.Add (item2); - - ToolbarItem itemArg = null; - - toolbar.ItemRemoved += (s, e) => { - itemArg = e.ToolbarItem; - }; - - toolbar.Remove (item); - Assert.AreEqual (item, itemArg); - - toolbar.Remove (item2); - Assert.AreEqual (item2, itemArg); - } - } - -} diff --git a/Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj b/Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj index 2609eef6..e8eeaba4 100644 --- a/Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj +++ b/Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj @@ -149,7 +149,6 @@ <Compile Include="TimePickerUnitTest.cs" /> <Compile Include="ToolbarItemTests.cs" /> <Compile Include="ToolbarTrackerTests.cs" /> - <Compile Include="ToolbarUnitTests.cs" /> <Compile Include="TypeUnitTests.cs" /> <Compile Include="ViewCellTests.cs" /> <Compile Include="ViewUnitTests.cs" /> diff --git a/Xamarin.Forms.Core/Toolbar.cs b/Xamarin.Forms.Core/Toolbar.cs deleted file mode 100644 index 4405d1f6..00000000 --- a/Xamarin.Forms.Core/Toolbar.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using Xamarin.Forms.Platform; - -namespace Xamarin.Forms -{ - // Marked as internal for 1.0 release until we are ready to release this - [RenderWith(typeof(_ToolbarRenderer))] - internal class Toolbar : View - { - readonly List<ToolbarItem> _items = new List<ToolbarItem>(); - - public ReadOnlyCollection<ToolbarItem> Items - { - get { return new ReadOnlyCollection<ToolbarItem>(_items); } - } - - public void Add(ToolbarItem item) - { - if (_items.Contains(item)) - return; - _items.Add(item); - if (ItemAdded != null) - ItemAdded(this, new ToolbarItemEventArgs(item)); - } - - public void Clear() - { - _items.Clear(); - } - - public event EventHandler<ToolbarItemEventArgs> ItemAdded; - - public event EventHandler<ToolbarItemEventArgs> ItemRemoved; - - public void Remove(ToolbarItem item) - { - if (_items.Remove(item)) - { - if (ItemRemoved != null) - ItemRemoved(this, new ToolbarItemEventArgs(item)); - } - } - } -}
\ No newline at end of file diff --git a/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj b/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj index a68ce579..b1925578 100644 --- a/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj +++ b/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj @@ -314,7 +314,6 @@ <Compile Include="TabbedPage.cs" /> <Compile Include="TemplateExtensions.cs" /> <Compile Include="TimePicker.cs" /> - <Compile Include="Toolbar.cs" /> <Compile Include="ToolbarTracker.cs" /> <Compile Include="ViewExtensions.cs" /> <Compile Include="ViewState.cs" /> diff --git a/Xamarin.Forms.Platform.Android/Renderers/ToolbarRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/ToolbarRenderer.cs deleted file mode 100644 index 92a774e8..00000000 --- a/Xamarin.Forms.Platform.Android/Renderers/ToolbarRenderer.cs +++ /dev/null @@ -1,65 +0,0 @@ -using Android.Widget; -using AScrollView = Android.Widget.ScrollView; -using AButton = Android.Widget.Button; -using AView = Android.Views.View; - -namespace Xamarin.Forms.Platform.Android -{ - public class ToolbarRenderer : ViewRenderer - { - public ToolbarRenderer() - { - AutoPackage = false; - } - - protected override void OnElementChanged(ElementChangedEventArgs<View> e) - { - base.OnElementChanged(e); - - if (e.OldElement == null) - { - var layout = new LinearLayout(Context); - layout.SetBackgroundColor(new Color(0.2, 0.2, 0.2, 0.5).ToAndroid()); - - layout.Orientation = Orientation.Horizontal; - - SetNativeControl(layout); - } - else - { - var oldToolbar = (Toolbar)e.OldElement; - oldToolbar.ItemAdded -= OnToolbarItemsChanged; - oldToolbar.ItemRemoved -= OnToolbarItemsChanged; - } - - UpdateChildren(); - - var toolbar = (Toolbar)e.NewElement; - toolbar.ItemAdded += OnToolbarItemsChanged; - toolbar.ItemRemoved += OnToolbarItemsChanged; - } - - void OnToolbarItemsChanged(object sender, ToolbarItemEventArgs e) - { - UpdateChildren(); - } - - void UpdateChildren() - { - RemoveAllViews(); - - foreach (ToolbarItem child in ((Toolbar)Element).Items) - { - AView view = null; - - if (!string.IsNullOrEmpty(child.Icon)) - view = new ToolbarImageButton(Context, child); - else - view = new AButton(Context); - - using (var param = new LinearLayout.LayoutParams(LayoutParams.WrapContent, (int)Context.ToPixels(48), 1)) - ((LinearLayout)Control).AddView(view, param); - } - } - } -}
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj index 2dea12eb..44bac817 100644 --- a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj +++ b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj @@ -223,7 +223,6 @@ <Compile Include="Renderers\TableViewModelRenderer.cs" /> <Compile Include="Renderers\TableViewRenderer.cs" /> <Compile Include="Renderers\TimePickerRenderer.cs" /> - <Compile Include="Renderers\ToolbarRenderer.cs" /> <Compile Include="Renderers\WebViewRenderer.cs" /> <Compile Include="ResourceManager.cs" /> <Compile Include="ViewExtensions.cs" /> diff --git a/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs b/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs index 8ebe9ba1..da60a639 100644 --- a/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs +++ b/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs @@ -39,7 +39,6 @@ using MonoTouch.UIKit; [assembly: ExportRenderer(typeof(Stepper), typeof(StepperRenderer))] [assembly: ExportRenderer(typeof(ProgressBar), typeof(ProgressBarRenderer))] [assembly: ExportRenderer(typeof(ScrollView), typeof(ScrollViewRenderer))] -[assembly: ExportRenderer(typeof(Toolbar), typeof(ToolbarRenderer))] [assembly: ExportRenderer(typeof(ActivityIndicator), typeof(ActivityIndicatorRenderer))] [assembly: ExportRenderer(typeof(Frame), typeof(FrameRenderer))] [assembly: ExportRenderer(typeof(NavigationMenu), typeof(NavigationMenuRenderer))] diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ToolbarRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ToolbarRenderer.cs deleted file mode 100644 index 705f95d8..00000000 --- a/Xamarin.Forms.Platform.iOS/Renderers/ToolbarRenderer.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System.Linq; -using System.Drawing; -#if __UNIFIED__ -using UIKit; - -#else -using MonoTouch.UIKit; -#endif - -namespace Xamarin.Forms.Platform.iOS -{ - public class ToolbarRenderer : ViewRenderer - { - protected override void Dispose(bool disposing) - { - if (disposing) - { - ((Toolbar)Element).ItemAdded -= OnItemAdded; - ((Toolbar)Element).ItemRemoved -= OnItemRemoved; - - if (((UIToolbar)Control).Items != null) - { - foreach (var item in ((UIToolbar)Control).Items) - item.Dispose(); - } - } - - base.Dispose(disposing); - } - - protected override void OnElementChanged(ElementChangedEventArgs<View> e) - { - base.OnElementChanged(e); - - SetNativeControl(new UIToolbar(RectangleF.Empty)); - UpdateItems(false); - - ((Toolbar)Element).ItemAdded += OnItemAdded; - ((Toolbar)Element).ItemRemoved += OnItemRemoved; - } - - void OnItemAdded(object sender, ToolbarItemEventArgs eventArg) - { - UpdateItems(true); - } - - void OnItemRemoved(object sender, ToolbarItemEventArgs eventArg) - { - UpdateItems(true); - } - - void UpdateItems(bool animated) - { - if (((UIToolbar)Control).Items != null) - { - for (var i = 0; i < ((UIToolbar)Control).Items.Length; i++) - ((UIToolbar)Control).Items[i].Dispose(); - } - var items = new UIBarButtonItem[((Toolbar)Element).Items.Count]; - for (var i = 0; i < ((Toolbar)Element).Items.Count; i++) - items[i] = ((Toolbar)Element).Items[i].ToUIBarButtonItem(); - - ((UIToolbar)Control).SetItems(items, animated); - } - } -}
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj index 1fc4340b..a3ba13c1 100644 --- a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj +++ b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj @@ -25,7 +25,8 @@ <MtouchDebug>true</MtouchDebug> <CodesignKey>iPhone Developer</CodesignKey> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn></NoWarn> + <NoWarn> + </NoWarn> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> @@ -38,7 +39,8 @@ <CodesignKey>iPhone Developer</CodesignKey> <DefineConstants>TRACE;__IOS__;__MOBILE__;</DefineConstants> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn></NoWarn> + <NoWarn> + </NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'"> <DebugSymbols>true</DebugSymbols> @@ -50,11 +52,13 @@ <ErrorReport>prompt</ErrorReport> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn></NoWarn> + <NoWarn> + </NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppStore|AnyCPU'"> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn></NoWarn> + <NoWarn> + </NoWarn> </PropertyGroup> <ItemGroup> <Compile Include="..\Xamarin.Forms.Core\Properties\GlobalAssemblyInfo.cs"> @@ -141,7 +145,6 @@ <Compile Include="$(MSBuildThisFileDirectory)Renderers\TableViewRenderer.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Renderers\TabletMasterDetailRenderer.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Renderers\TimePickerRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\ToolbarRenderer.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Renderers\WebViewRenderer.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Properties\AssemblyInfo.cs" /> <Compile Include="iOSAppIndexingProvider.cs" /> diff --git a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj index dde9103e..1f9a92e2 100644 --- a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj +++ b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj @@ -20,7 +20,8 @@ <WarningLevel>4</WarningLevel> <ConsolePause>false</ConsolePause> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn></NoWarn> + <NoWarn> + </NoWarn> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>full</DebugType> @@ -30,7 +31,8 @@ <WarningLevel>4</WarningLevel> <ConsolePause>false</ConsolePause> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn></NoWarn> + <NoWarn> + </NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'"> <DebugSymbols>true</DebugSymbols> @@ -42,11 +44,13 @@ <ErrorReport>prompt</ErrorReport> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn></NoWarn> + <NoWarn> + </NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppStore|AnyCPU'"> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn></NoWarn> + <NoWarn> + </NoWarn> </PropertyGroup> <ItemGroup> <Reference Include="System" /> @@ -120,7 +124,6 @@ <Compile Include="$(MSBuildThisFileDirectory)Renderers\TableViewRenderer.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Renderers\TabletMasterDetailRenderer.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Renderers\TimePickerRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\ToolbarRenderer.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Renderers\WebViewRenderer.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Properties\AssemblyInfo.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Extensions\CellExtensions.cs" /> diff --git a/Xamarin.Forms.Platform/Xamarin.Forms.Platform.cs b/Xamarin.Forms.Platform/Xamarin.Forms.Platform.cs index bdb66b86..4ddfc19b 100644 --- a/Xamarin.Forms.Platform/Xamarin.Forms.Platform.cs +++ b/Xamarin.Forms.Platform/Xamarin.Forms.Platform.cs @@ -83,10 +83,6 @@ { } - internal class _ToolbarRenderer - { - } - internal class _ActivityIndicatorRenderer { } |