Move Xamarin.Forms renderer initialization (#632)

Also mark Forms.Init() obsolete.

CHANGELOG.md

@@ -49,6 +49,9 @@ All notable changes to this project will be documented in this file.
 - Change to semantic versioning (#595)
 - Change GTKSharp3 project to x86 (#599)
 - Change OxyPlot.Xamarin.Android to API Level 15 (#614)
+- Add Xamarin.Forms renderer initialization to PlotViewRenderer (#632)
+- Marked OxyPlot.Xamarin.Forms.Platform.*.Forms.Init() obsolete (#632)
+- Throw exception if Xamarin.Forms renderer is not 'initialized' (#492)
 
 ### Removed
 - StyleCop tasks (#556)
@@ -108,7 +111,6 @@ All notable changes to this project will be documented in this file.
 - Rendering math text with syntax error gets stuck in an endless loop (#624)
 - Fix issue with MinimumRange not taking Minimum and Maximum values into account (#550)
 - Do not set default Controller in PlotView ctor (#436)
-- Throw exception if Xamarin.Forms renderer is not 'initialized' (#492)
 
 ## [2014.1.546] - 2014-10-22
 ### Added

Source/Examples/Xamarin.Forms/IssueDemos/IssueDemos.Droid/MainActivity.cs

@@ -17,7 +17,7 @@ namespace IssueDemos.Droid
             base.OnCreate(bundle);
 
             global::Xamarin.Forms.Forms.Init(this, bundle);
-            OxyPlot.Xamarin.Forms.Platform.Android.Forms.Init();
+            OxyPlot.Xamarin.Forms.Platform.Android.PlotViewRenderer.Init();
             LoadApplication(new App());
         }
     }

Source/Examples/Xamarin.Forms/IssueDemos/IssueDemos.WinPhone/MainPage.xaml.cs

@@ -18,7 +18,7 @@ namespace IssueDemos.WinPhone
             SupportedOrientations = SupportedPageOrientation.PortraitOrLandscape;
 
             global::Xamarin.Forms.Forms.Init();
-            OxyPlot.Xamarin.Forms.Platform.WP8.Forms.Init();
+            OxyPlot.Xamarin.Forms.Platform.WP8.PlotViewRenderer.Init();
             LoadApplication(new IssueDemos.App());
         }
     }

Source/Examples/Xamarin.Forms/IssueDemos/IssueDemos.iOS/AppDelegate.cs

@@ -23,7 +23,7 @@ namespace IssueDemos.iOS
         public override bool FinishedLaunching(UIApplication app, NSDictionary options)
         {
             global::Xamarin.Forms.Forms.Init();
-            OxyPlot.Xamarin.Forms.Platform.iOS.Forms.Init();
+            OxyPlot.Xamarin.Forms.Platform.iOS.PlotViewRenderer.Init();
             LoadApplication(new App());
 
             return base.FinishedLaunching(app, options);

Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo.Droid/MainActivity.cs

@@ -19,8 +19,8 @@ namespace SimpleDemo.Droid
         {
             base.OnCreate(bundle);
 
-            OxyPlot.Xamarin.Forms.Platform.Android.Forms.Init(); 
             Xamarin.Forms.Forms.Init(this, bundle);
+            OxyPlot.Xamarin.Forms.Platform.Android.PlotViewRenderer.Init();
             this.LoadApplication(new App());
         }
     }

Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo.WinPhone/MainPage.xaml.cs

@@ -23,8 +23,8 @@ namespace SimpleDemo.WinPhone
             this.InitializeComponent();
             this.SupportedOrientations = SupportedPageOrientation.PortraitOrLandscape;
 
-            OxyPlot.Xamarin.Forms.Platform.WP8.Forms.Init();
             Xamarin.Forms.Forms.Init();
+            OxyPlot.Xamarin.Forms.Platform.WP8.PlotViewRenderer.Init();
             this.LoadApplication(new SimpleDemo.App());
         }
     }

Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo.iOS/AppDelegate.cs

@@ -37,8 +37,8 @@ namespace SimpleDemo.iOS
         /// </returns>
         public override bool FinishedLaunching(UIApplication app, NSDictionary options)
         {
-            OxyPlot.Xamarin.Forms.Platform.iOS.Forms.Init();
             Xamarin.Forms.Forms.Init();
+            OxyPlot.Xamarin.Forms.Platform.iOS.PlotViewRenderer.Init();
             this.LoadApplication(new App());
 
             return base.FinishedLaunching(app, options);

Source/Examples/Xamarin.Forms/SimpleDemo2/SimpleDemo2.Droid/MainActivity.cs

@@ -17,7 +17,7 @@ namespace SimpleDemo2.Droid
 			base.OnCreate (bundle);
 
 			global::Xamarin.Forms.Forms.Init (this, bundle);
-		    OxyPlot.Xamarin.Forms.Platform.Android.Forms.Init();
+		    OxyPlot.Xamarin.Forms.Platform.Android.PlotViewRenderer.Init();
 			LoadApplication (new SimpleDemo2.App ());
 		}
 	}

Source/Examples/Xamarin.Forms/SimpleDemo2/SimpleDemo2.WinPhone/MainPage.xaml.cs

@@ -18,7 +18,7 @@ namespace SimpleDemo2.WinPhone
 			SupportedOrientations = SupportedPageOrientation.PortraitOrLandscape;
 
 			global::Xamarin.Forms.Forms.Init ();
-            OxyPlot.Xamarin.Forms.Platform.WP8.Forms.Init();
+            OxyPlot.Xamarin.Forms.Platform.WP8.PlotViewRenderer.Init();
             LoadApplication(new SimpleDemo2.App ());
 		}
 	}

Source/Examples/Xamarin.Forms/SimpleDemo2/SimpleDemo2.iOS/AppDelegate.cs

@@ -23,7 +23,7 @@ namespace SimpleDemo2.iOS
 		public override bool FinishedLaunching(UIApplication app, NSDictionary options)
 		{
 			global::Xamarin.Forms.Forms.Init ();
-            OxyPlot.Xamarin.Forms.Platform.iOS.Forms.Init ();
+            OxyPlot.Xamarin.Forms.Platform.iOS.PlotViewRenderer.Init ();
 			LoadApplication (new SimpleDemo2.App ());
 
 			return base.FinishedLaunching (app, options);

Source/OxyPlot.Xamarin.Forms.Platform.Android/Forms.cs

@@ -9,6 +9,8 @@
 
 namespace OxyPlot.Xamarin.Forms.Platform.Android
 {
+    using System;
+
     /// <summary>
     /// Initializes OxyPlot renderers for use with Xamarin.Forms.
     /// </summary>
@@ -17,12 +19,10 @@ namespace OxyPlot.Xamarin.Forms.Platform.Android
         /// <summary>
         /// Initializes OxyPlot for Xamarin.Forms.
         /// </summary>
-        /// <remarks>This method must be called before Forms.Init().</remarks>
+        [Obsolete("Use PlotViewRenderer.Init() instead.")]
         public static void Init()
         {
-            // Just bring this assembly into the current appdomain.
-            // Forms.Init() should now find it!
-            PlotView.IsRendererInitialized = true;
+            PlotViewRenderer.Init();
         }
     }
 }

Source/OxyPlot.Xamarin.Forms.Platform.Android/PlotViewRenderer.cs

@@ -18,11 +18,29 @@ namespace OxyPlot.Xamarin.Forms.Platform.Android
     /// </summary>
     public class PlotViewRenderer : ViewRenderer<Xamarin.Forms.PlotView, PlotView>
     {
+        /// <summary>
+        /// Initializes static members of the <see cref="PlotViewRenderer"/> class.
+        /// </summary>
+        static PlotViewRenderer()
+        {
+            Init();
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PlotViewRenderer"/> class.
         /// </summary>
         public PlotViewRenderer()
         {
+            // Do not delete
+        }
+
+        /// <summary>
+        /// Initializes the renderer.
+        /// </summary>
+        /// <remarks>This method must be called before a <see cref="T:PlotView" /> is used.</remarks>
+        public static void Init()
+        {
+            OxyPlot.Xamarin.Forms.PlotView.IsRendererInitialized = true;
         }
 
         /// <summary>

Source/OxyPlot.Xamarin.Forms.Platform.WP8/Forms.cs

@@ -9,6 +9,8 @@
 
 namespace OxyPlot.Xamarin.Forms.Platform.WP8
 {
+    using System;
+
     /// <summary>
     /// Initializes OxyPlot renderers for use with Xamarin.Forms.
     /// </summary>
@@ -17,12 +19,10 @@ namespace OxyPlot.Xamarin.Forms.Platform.WP8
         /// <summary>
         /// Initializes OxyPlot for Xamarin.Forms.
         /// </summary>
-        /// <remarks>This method must be called before Forms.Init().</remarks>
+        [Obsolete("Use PlotViewRenderer.Init() instead.")]
         public static void Init()
         {
-            // Just bring this assembly into the current appdomain.
-            // Forms.Init() should now find it!
-            PlotView.IsRendererInitialized = true;
+            PlotViewRenderer.Init();
         }
     }
 }

Source/OxyPlot.Xamarin.Forms.Platform.WP8/PlotViewRenderer.cs

@@ -18,11 +18,29 @@ namespace OxyPlot.Xamarin.Forms.Platform.WP8
     /// </summary>
     public class PlotViewRenderer : ViewRenderer<Xamarin.Forms.PlotView, PlotView>
     {
+        /// <summary>
+        /// Initializes static members of the <see cref="PlotViewRenderer"/> class.
+        /// </summary>
+        static PlotViewRenderer()
+        {
+            Init();
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PlotViewRenderer"/> class.
         /// </summary>
         public PlotViewRenderer()
         {
+            // Do not delete
+        }
+
+        /// <summary>
+        /// Initializes the renderer.
+        /// </summary>
+        /// <remarks>This method must be called before a <see cref="T:PlotView" /> is used.</remarks>
+        public static void Init()
+        {
+            OxyPlot.Xamarin.Forms.PlotView.IsRendererInitialized = true;
         }
 
         /// <summary>

Source/OxyPlot.Xamarin.Forms.Platform.iOS.Classic/Forms.cs

@@ -9,6 +9,8 @@
 
 namespace OxyPlot.Xamarin.Forms.Platform.iOS.Classic
 {
+    using System;
+
     /// <summary>
     /// Initializes OxyPlot renderers for use with Xamarin.Forms.
     /// </summary>
@@ -17,12 +19,11 @@ namespace OxyPlot.Xamarin.Forms.Platform.iOS.Classic
         /// <summary>
         /// Initializes OxyPlot for Xamarin.Forms.
         /// </summary>
-        /// <remarks>This method must be called before Forms.Init().</remarks>
+        /// <remarks>This method must be called before a <see cref="T:PlotView" /> is used.</remarks>
+        [Obsolete("Use PlotViewRenderer.Init() instead.")]
         public static void Init()
         {
-            // Just bring this assembly into the current appdomain.
-            // Forms.Init() should now find it!
-            PlotView.IsRendererInitialized = true;
+            PlotViewRenderer.Init();
         }
     }
 }

Source/OxyPlot.Xamarin.Forms.Platform.iOS.Classic/PlotViewRenderer.cs

@@ -18,11 +18,29 @@ namespace OxyPlot.Xamarin.Forms.Platform.iOS.Classic
     /// </summary>
     public class PlotViewRenderer : ViewRenderer<Xamarin.Forms.PlotView, PlotView>
     {
+        /// <summary>
+        /// Initializes static members of the <see cref="PlotViewRenderer"/> class.
+        /// </summary>
+        static PlotViewRenderer()
+        {
+            Init();
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PlotViewRenderer"/> class.
         /// </summary>
         public PlotViewRenderer()
         {
+            // Do not delete
+        }
+
+        /// <summary>
+        /// Initializes the renderer.
+        /// </summary>
+        /// <remarks>This method must be called before a <see cref="T:PlotView" /> is used.</remarks>
+        public static new void Init()
+        {
+            OxyPlot.Xamarin.Forms.PlotView.IsRendererInitialized = true;
         }
 
         /// <summary>

Source/OxyPlot.Xamarin.Forms.Platform.iOS/Forms.cs

@@ -9,6 +9,8 @@
 
 namespace OxyPlot.Xamarin.Forms.Platform.iOS
 {
+    using System;
+
     /// <summary>
     /// Initializes OxyPlot renderers for use with Xamarin.Forms.
     /// </summary>
@@ -17,12 +19,10 @@ namespace OxyPlot.Xamarin.Forms.Platform.iOS
         /// <summary>
         /// Initializes OxyPlot for Xamarin.Forms.
         /// </summary>
-        /// <remarks>This method must be called before Forms.Init().</remarks>
+        [Obsolete("Use PlotViewRenderer.Init() instead.")]
         public static void Init()
         {
-            // Just bring this assembly into the current appdomain.
-            // Forms.Init() should now find it!
-            PlotView.IsRendererInitialized = true;
+            PlotViewRenderer.Init();
         }
     }
 }

Source/OxyPlot.Xamarin.Forms.Platform.iOS/PlotViewRenderer.cs

@@ -15,11 +15,29 @@ namespace OxyPlot.Xamarin.Forms.Platform.iOS
     /// </summary>
     public class PlotViewRenderer : ViewRenderer<Xamarin.Forms.PlotView, PlotView>
     {
+        /// <summary>
+        /// Initializes static members of the <see cref="PlotViewRenderer"/> class.
+        /// </summary>
+        static PlotViewRenderer()
+        {
+            Init();
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PlotViewRenderer"/> class.
         /// </summary>
         public PlotViewRenderer()
         {
+            // Do not delete
+        }
+
+        /// <summary>
+        /// Initializes the renderer.
+        /// </summary>
+        /// <remarks>This method must be called before a <see cref="T:PlotView" /> is used.</remarks>
+        public static new void Init()
+        {
+            OxyPlot.Xamarin.Forms.PlotView.IsRendererInitialized = true;
         }
 
         /// <summary>

Source/OxyPlot.Xamarin.Forms/PlotView.cs

@@ -43,15 +43,15 @@ namespace OxyPlot.Xamarin.Forms
                 {
                     case TargetPlatform.WinPhone:
                         message +=
-                            "\nRemember to add `OxyPlot.Xamarin.Forms.Platform.WP8.Forms.Init();` after `Xamarin.Forms.Forms.Init();` in the Windows Phone app project.";
+                            "\nRemember to add `OxyPlot.Xamarin.Forms.Platform.WP8.PlotViewRenderer.Init();` after `Xamarin.Forms.Forms.Init();` in the Windows Phone app project.";
                         break;
                     case TargetPlatform.Android:
                         message +=
-                            "\nRemember to add `OxyPlot.Xamarin.Forms.Platform.Android.Forms.Init();` after `Xamarin.Forms.Forms.Init();` in the Android app project.";
+                            "\nRemember to add `OxyPlot.Xamarin.Forms.Platform.Android.PlotViewRenderer.Init();` after `Xamarin.Forms.Forms.Init();` in the Android app project.";
                         break;
                     case TargetPlatform.iOS:
                         message +=
-                            "\nRemember to add `OxyPlot.Xamarin.Forms.Platform.iOS.Forms.Init();` after `Xamarin.Forms.Forms.Init();` in the iOS app project.";
+                            "\nRemember to add `OxyPlot.Xamarin.Forms.Platform.iOS.PlotViewRenderer.Init();` after `Xamarin.Forms.Forms.Init();` in the iOS app project.";
                         break;
                 }
                 throw new InvalidOperationException(message);