[Tizen] Fix Forms namespace correctly (#7193)

diff --git a/PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.cs b/PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.cs
index 07ea73e..cbdc5e0 100644 (file)
--- a/PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.cs
+++ b/PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms.Platform.Tizen;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
 
 namespace PagesGallery.Tizen
 {
@@ -13,8 +14,8 @@ namespace PagesGallery.Tizen
                static void Main(string[] args)
                {
                        var app = new Program();
-                       global::Xamarin.Forms.Platform.Tizen.Forms.Init(app);
+                       Forms.Init(app);
                        app.Run(args);
                }
        }
-}
\ No newline at end of file
+}

diff --git a/Xamarin.Forms.ControlGallery.Tizen/ControlGallery.Tizen.cs b/Xamarin.Forms.ControlGallery.Tizen/ControlGallery.Tizen.cs
index 53b658f..5462bcc 100644 (file)
--- a/Xamarin.Forms.ControlGallery.Tizen/ControlGallery.Tizen.cs
+++ b/Xamarin.Forms.ControlGallery.Tizen/ControlGallery.Tizen.cs
@@ -1,3 +1,4 @@
+using Xamarin.Forms;
 using Xamarin.Forms.Platform.Tizen;
 using Xamarin.Forms.Controls;
 using ElmSharp;
@@ -21,8 +22,8 @@ namespace Xamarin.Forms.ControlGallery.Tizen
                {
                        var app = new MainApplication();
                        FormsMaps.Init("HERE", "write-your-API-key-here");
-                       global::Xamarin.Forms.Platform.Tizen.Forms.SetFlags("CollectionView_Experimental", "Shell_Experimental");
-                       global::Xamarin.Forms.Platform.Tizen.Forms.Init(app);
+                       Forms.SetFlags("CollectionView_Experimental", "Shell_Experimental");
+                       Forms.Init(app);
                        FormsMaterial.Init();
                        app.Run(args);
                }

diff --git a/Xamarin.Forms.ControlGallery.Tizen/DisposeLabelRenderer.cs b/Xamarin.Forms.ControlGallery.Tizen/DisposeLabelRenderer.cs
index 6f32ce9..aa7fe2a 100644 (file)
--- a/Xamarin.Forms.ControlGallery.Tizen/DisposeLabelRenderer.cs
+++ b/Xamarin.Forms.ControlGallery.Tizen/DisposeLabelRenderer.cs
@@ -1,3 +1,4 @@
+using Xamarin.Forms;
 using Xamarin.Forms.Controls;
 using Xamarin.Forms.ControlGallery.Tizen;
 using Xamarin.Forms.Platform.Tizen;

diff --git a/Xamarin.Forms.ControlGallery.Tizen/DisposePageRenderer.cs b/Xamarin.Forms.ControlGallery.Tizen/DisposePageRenderer.cs
index c2d069f..96c96a5 100644 (file)
--- a/Xamarin.Forms.ControlGallery.Tizen/DisposePageRenderer.cs
+++ b/Xamarin.Forms.ControlGallery.Tizen/DisposePageRenderer.cs
@@ -1,3 +1,4 @@
+using Xamarin.Forms;
 using Xamarin.Forms.Controls;
 using Xamarin.Forms.ControlGallery.Tizen;
 using Xamarin.Forms.Platform.Tizen;

diff --git a/Xamarin.Forms.Maps.Tizen/MapRenderer.cs b/Xamarin.Forms.Maps.Tizen/MapRenderer.cs
index 15363b3..ac9e908 100644 (file)
--- a/Xamarin.Forms.Maps.Tizen/MapRenderer.cs
+++ b/Xamarin.Forms.Maps.Tizen/MapRenderer.cs
@@ -6,6 +6,7 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using Tizen.Location;
 using Tizen.Maps;
+using Xamarin.Forms;
 using Xamarin.Forms.Platform.Tizen;
 using TPin = Tizen.Maps.Pin;
 
@@ -40,7 +41,7 @@ namespace Xamarin.Forms.Maps.Tizen
                {
                        if (Control == null)
                        {
-                               var mapControl = new MapView(Platform.Tizen.Forms.NativeParent, FormsMaps.MapService);
+                               var mapControl = new MapView(Forms.NativeParent, FormsMaps.MapService);
 
                                mapControl.RenderPost += OnVisibleRegionChanged;
 

diff --git a/Xamarin.Forms.Maps.Tizen/Properties/AssemblyInfo.cs b/Xamarin.Forms.Maps.Tizen/Properties/AssemblyInfo.cs
index c347739..f4a7254 100644 (file)
--- a/Xamarin.Forms.Maps.Tizen/Properties/AssemblyInfo.cs
+++ b/Xamarin.Forms.Maps.Tizen/Properties/AssemblyInfo.cs
@@ -1,6 +1,5 @@
-using System.Reflection;
+using Xamarin.Forms;
 using Xamarin.Forms.Maps;
 using Xamarin.Forms.Maps.Tizen;
-using Xamarin.Forms.Platform.Tizen;
 
 [assembly: ExportRenderer(typeof (Map), typeof (MapRenderer))]
\ No newline at end of file

diff --git a/Xamarin.Forms.Material.Tizen/FormsMaterial.cs b/Xamarin.Forms.Material.Tizen/FormsMaterial.cs
index e40f943..06de1b3 100644 (file)
--- a/Xamarin.Forms.Material.Tizen/FormsMaterial.cs
+++ b/Xamarin.Forms.Material.Tizen/FormsMaterial.cs
@@ -1,5 +1,4 @@
-using System;
-using Tizen.NET.MaterialComponents;
+using Tizen.NET.MaterialComponents;
 using Xamarin.Forms.Material.Tizen;
 
 namespace Xamarin.Forms

diff --git a/Xamarin.Forms.Material.Tizen/MaterialActivityIndicatorRenderer.cs b/Xamarin.Forms.Material.Tizen/MaterialActivityIndicatorRenderer.cs
index 6ae0623..e3ac7fa 100644 (file)
--- a/Xamarin.Forms.Material.Tizen/MaterialActivityIndicatorRenderer.cs
+++ b/Xamarin.Forms.Material.Tizen/MaterialActivityIndicatorRenderer.cs
@@ -2,7 +2,6 @@
 using Xamarin.Forms.Platform.Tizen;
 using Xamarin.Forms.Material.Tizen;
 using Tizen.NET.MaterialComponents;
-using TForms = Xamarin.Forms.Platform.Tizen.Forms;
 
 [assembly: ExportRenderer(typeof(ActivityIndicator), typeof(MaterialActivityIndicatorRenderer), new[] { typeof(VisualMarker.MaterialVisual) })]
 namespace Xamarin.Forms.Material.Tizen
@@ -13,7 +12,7 @@ namespace Xamarin.Forms.Material.Tizen
                {
                        if (Control == null)
                        {
-                               SetNativeControl(new MActivityIndicator(TForms.NativeParent));
+                               SetNativeControl(new MActivityIndicator(Forms.NativeParent));
                        }
 
                        base.OnElementChanged(e);

diff --git a/Xamarin.Forms.Material.Tizen/MaterialButtonRenderer.cs b/Xamarin.Forms.Material.Tizen/MaterialButtonRenderer.cs
index 04846f2..df6a59a 100644 (file)
--- a/Xamarin.Forms.Material.Tizen/MaterialButtonRenderer.cs
+++ b/Xamarin.Forms.Material.Tizen/MaterialButtonRenderer.cs
@@ -2,7 +2,6 @@
 using Xamarin.Forms.Platform.Tizen;
 using Xamarin.Forms.Platform.Tizen.Native;
 using Xamarin.Forms.Material.Tizen;
-using TForms = Xamarin.Forms.Platform.Tizen.Forms;
 using XFButton = Xamarin.Forms.Button;
 using EButton = ElmSharp.Button;
 
@@ -13,7 +12,7 @@ namespace Xamarin.Forms.Material.Tizen
        {
                protected override EButton CreateNativeControl()
                {
-                       return new MaterialButton(TForms.NativeParent);
+                       return new MaterialButton(Forms.NativeParent);
                }
        }
 }

diff --git a/Xamarin.Forms.Material.Tizen/MaterialCheckBoxRenderer.cs b/Xamarin.Forms.Material.Tizen/MaterialCheckBoxRenderer.cs
index cd7a13d..bf8dafa 100644 (file)
--- a/Xamarin.Forms.Material.Tizen/MaterialCheckBoxRenderer.cs
+++ b/Xamarin.Forms.Material.Tizen/MaterialCheckBoxRenderer.cs
@@ -2,7 +2,6 @@
 using Xamarin.Forms.Platform.Tizen;
 using Xamarin.Forms.Material.Tizen;
 using Tizen.NET.MaterialComponents;
-using TForms = Xamarin.Forms.Platform.Tizen.Forms;
 
 [assembly: ExportRenderer(typeof(CheckBox), typeof(MaterialCheckBoxRenderer), new[] { typeof(VisualMarker.MaterialVisual) })]
 namespace Xamarin.Forms.Material.Tizen
@@ -13,7 +12,7 @@ namespace Xamarin.Forms.Material.Tizen
                {
                        if (Control == null)
                        {
-                               SetNativeControl(new MCheckBox(TForms.NativeParent));
+                               SetNativeControl(new MCheckBox(Forms.NativeParent));
                        }
                        base.OnElementChanged(e);
                }

diff --git a/Xamarin.Forms.Material.Tizen/MaterialEntryRenderer.cs b/Xamarin.Forms.Material.Tizen/MaterialEntryRenderer.cs
index c3218fe..26e0203 100644 (file)
--- a/Xamarin.Forms.Material.Tizen/MaterialEntryRenderer.cs
+++ b/Xamarin.Forms.Material.Tizen/MaterialEntryRenderer.cs
@@ -2,7 +2,6 @@
 using Xamarin.Forms.Platform.Tizen;
 using Xamarin.Forms.Platform.Tizen.Native;
 using Xamarin.Forms.Material.Tizen;
-using TForms = Xamarin.Forms.Platform.Tizen.Forms;
 using XFEntry = Xamarin.Forms.Entry;
 
 [assembly: ExportRenderer(typeof(XFEntry), typeof(MaterialEntryRenderer), new[] { typeof(VisualMarker.MaterialVisual) })]
@@ -12,7 +11,7 @@ namespace Xamarin.Forms.Material.Tizen
        {
                protected override ElmSharp.Entry CreateNativeControl()
                {
-                       return new MaterialEntry(TForms.NativeParent)
+                       return new MaterialEntry(Forms.NativeParent)
                        {
                                IsSingleLine = true,
                        };

diff --git a/Xamarin.Forms.Material.Tizen/MaterialFrameRenderer.cs b/Xamarin.Forms.Material.Tizen/MaterialFrameRenderer.cs
index 80324fb..c5934ad 100644 (file)
--- a/Xamarin.Forms.Material.Tizen/MaterialFrameRenderer.cs
+++ b/Xamarin.Forms.Material.Tizen/MaterialFrameRenderer.cs
@@ -3,7 +3,6 @@ using Xamarin.Forms.Platform.Tizen;
 using Xamarin.Forms.Platform.Tizen.Native;
 using Xamarin.Forms.Material.Tizen;
 using Tizen.NET.MaterialComponents;
-using TForms = Xamarin.Forms.Platform.Tizen.Forms;
 
 [assembly: ExportRenderer(typeof(Frame), typeof(MaterialFrameRenderer), new[] { typeof(VisualMarker.MaterialVisual) })]
 namespace Xamarin.Forms.Material.Tizen
@@ -20,7 +19,7 @@ namespace Xamarin.Forms.Material.Tizen
                {
                        if (Control == null)
                        {
-                               SetNativeControl(new MaterialCanvas(TForms.NativeParent));
+                               SetNativeControl(new MaterialCanvas(Forms.NativeParent));
                        }
                        base.OnElementChanged(e);
                }

diff --git a/Xamarin.Forms.Material.Tizen/MaterialProgressBarRenderer.cs b/Xamarin.Forms.Material.Tizen/MaterialProgressBarRenderer.cs
index 09756ff..8a9bc15 100644 (file)
--- a/Xamarin.Forms.Material.Tizen/MaterialProgressBarRenderer.cs
+++ b/Xamarin.Forms.Material.Tizen/MaterialProgressBarRenderer.cs
@@ -2,7 +2,6 @@
 using Xamarin.Forms.Platform.Tizen;
 using Xamarin.Forms.Material.Tizen;
 using Tizen.NET.MaterialComponents;
-using TForms = Xamarin.Forms.Platform.Tizen.Forms;
 
 [assembly: ExportRenderer(typeof(ProgressBar), typeof(MaterialProgressBarRenderer), new[] { typeof(VisualMarker.MaterialVisual) })]
 namespace Xamarin.Forms.Material.Tizen
@@ -13,7 +12,7 @@ namespace Xamarin.Forms.Material.Tizen
                {
                        if (Control == null)
                        {
-                               SetNativeControl(new MProgressIndicator(TForms.NativeParent));
+                               SetNativeControl(new MProgressIndicator(Forms.NativeParent));
                        }
                        base.OnElementChanged(e);
                }

diff --git a/Xamarin.Forms.Material.Tizen/MaterialSliderRenderer.cs b/Xamarin.Forms.Material.Tizen/MaterialSliderRenderer.cs
index c0eefe4..83e5212 100644 (file)
--- a/Xamarin.Forms.Material.Tizen/MaterialSliderRenderer.cs
+++ b/Xamarin.Forms.Material.Tizen/MaterialSliderRenderer.cs
@@ -2,7 +2,6 @@
 using Xamarin.Forms.Platform.Tizen;
 using Xamarin.Forms.Material.Tizen;
 using Tizen.NET.MaterialComponents;
-using TForms = Xamarin.Forms.Platform.Tizen.Forms;
 
 [assembly: ExportRenderer(typeof(Slider), typeof(MaterialSliderRenderer), new[] { typeof(VisualMarker.MaterialVisual) })]
 namespace Xamarin.Forms.Material.Tizen
@@ -13,7 +12,7 @@ namespace Xamarin.Forms.Material.Tizen
                {
                        if (Control == null)
                        {
-                               SetNativeControl(new MSlider(TForms.NativeParent));
+                               SetNativeControl(new MSlider(Forms.NativeParent));
                        }
                        base.OnElementChanged(e);
                }

diff --git a/Xamarin.Forms.Platform.Tizen/ExportCellAttribute.cs b/Xamarin.Forms.Platform.Tizen/ExportCellAttribute.cs
index e0435ad..4a15b1a 100644 (file)
--- a/Xamarin.Forms.Platform.Tizen/ExportCellAttribute.cs
+++ b/Xamarin.Forms.Platform.Tizen/ExportCellAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Xamarin.Forms.Platform.Tizen
+namespace Xamarin.Forms
 {
        [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
        public sealed class ExportCellAttribute : HandlerAttribute

diff --git a/Xamarin.Forms.Platform.Tizen/ExportRendererHandler.cs b/Xamarin.Forms.Platform.Tizen/ExportHandlerAttribute.cs
similarity index 85%
rename from Xamarin.Forms.Platform.Tizen/ExportRendererHandler.cs
rename to Xamarin.Forms.Platform.Tizen/ExportHandlerAttribute.cs
index dc6a3ae..7153fb5 100644 (file)
--- a/Xamarin.Forms.Platform.Tizen/ExportRendererHandler.cs
+++ b/Xamarin.Forms.Platform.Tizen/ExportHandlerAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Xamarin.Forms.Platform.Tizen
+namespace Xamarin.Forms
 {
        [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
        public sealed class ExportHandlerAttribute : HandlerAttribute
@@ -9,4 +9,4 @@ namespace Xamarin.Forms.Platform.Tizen
                {
                }
        }
-}
\ No newline at end of file
+}

diff --git a/Xamarin.Forms.Platform.Tizen/ExportImageSourceHandlerAttribute.cs b/Xamarin.Forms.Platform.Tizen/ExportImageSourceHandlerAttribute.cs
index 4463db8..5d124de 100644 (file)
--- a/Xamarin.Forms.Platform.Tizen/ExportImageSourceHandlerAttribute.cs
+++ b/Xamarin.Forms.Platform.Tizen/ExportImageSourceHandlerAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Xamarin.Forms.Platform.Tizen
+namespace Xamarin.Forms
 {
        [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
        public sealed class ExportImageSourceHandlerAttribute : HandlerAttribute

diff --git a/Xamarin.Forms.Platform.Tizen/ExportRendererAttribute.cs b/Xamarin.Forms.Platform.Tizen/ExportRendererAttribute.cs
index 4e1e193..fedafe7 100644 (file)
--- a/Xamarin.Forms.Platform.Tizen/ExportRendererAttribute.cs
+++ b/Xamarin.Forms.Platform.Tizen/ExportRendererAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Xamarin.Forms.Platform.Tizen
+namespace Xamarin.Forms
 {
        [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
        public sealed class ExportRendererAttribute : HandlerAttribute

diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/PageExtensions.cs b/Xamarin.Forms.Platform.Tizen/Extensions/PageExtensions.cs
index c443adf..cd07423 100644 (file)
--- a/Xamarin.Forms.Platform.Tizen/Extensions/PageExtensions.cs
+++ b/Xamarin.Forms.Platform.Tizen/Extensions/PageExtensions.cs
@@ -7,7 +7,7 @@ namespace Xamarin.Forms
        {
                public static EvasObject CreateEvasObject(this Page page, EvasObject parent, bool hasAlpha = false)
                {
-                       if (!Platform.Tizen.Forms.IsInitialized)
+                       if (!Forms.IsInitialized)
                                throw new InvalidOperationException("call Forms.Init() before this");
 
                        if (parent == null)

diff --git a/Xamarin.Forms.Platform.Tizen/Forms.cs b/Xamarin.Forms.Platform.Tizen/Forms.cs
index 97dfc78..057692f 100644 (file)
--- a/Xamarin.Forms.Platform.Tizen/Forms.cs
+++ b/Xamarin.Forms.Platform.Tizen/Forms.cs
@@ -4,13 +4,14 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using Xamarin.Forms.Internals;
+using Xamarin.Forms.Platform.Tizen;
 using ElmSharp;
 using Tizen.Applications;
 using TSystemInfo = Tizen.System.Information;
 using ELayout = ElmSharp.Layout;
 using DeviceOrientation = Xamarin.Forms.Internals.DeviceOrientation;
 
-namespace Xamarin.Forms.Platform.Tizen
+namespace Xamarin.Forms
 {
        public static class Forms
        {

diff --git a/Xamarin.Forms.Platform.Tizen/TizenTitleBarVisibility.cs b/Xamarin.Forms.Platform.Tizen/TizenTitleBarVisibility.cs
index 4cd09d8..9fa3fe6 100644 (file)
--- a/Xamarin.Forms.Platform.Tizen/TizenTitleBarVisibility.cs
+++ b/Xamarin.Forms.Platform.Tizen/TizenTitleBarVisibility.cs
@@ -1,4 +1,4 @@
-namespace Xamarin.Forms.Platform.Tizen
+namespace Xamarin.Forms
 {
        public enum TizenTitleBarVisibility
        {

diff --git a/Xamarin.Forms.Platform.Tizen/ViewInitializedEventArgs.cs b/Xamarin.Forms.Platform.Tizen/ViewInitializedEventArgs.cs
index fb05c1a..126e283 100644 (file)
--- a/Xamarin.Forms.Platform.Tizen/ViewInitializedEventArgs.cs
+++ b/Xamarin.Forms.Platform.Tizen/ViewInitializedEventArgs.cs
@@ -1,7 +1,7 @@
 using System;
 using ElmSharp;
 
-namespace Xamarin.Forms.Platform.Tizen
+namespace Xamarin.Forms
 {
        public class ViewInitializedEventArgs : EventArgs
        {