зеркало из https://github.com/DeGsoft/maui-linux.git
[Tizen] Fix Forms namespace correctly (#7193)
This commit is contained in:
Родитель
e63d0418c2
Коммит
659fa4faac
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Controls;
|
||||
using Xamarin.Forms.ControlGallery.Tizen;
|
||||
using Xamarin.Forms.Platform.Tizen;
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Controls;
|
||||
using Xamarin.Forms.ControlGallery.Tizen;
|
||||
using Xamarin.Forms.Platform.Tizen;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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))]
|
|
@ -1,5 +1,4 @@
|
|||
using System;
|
||||
using Tizen.NET.MaterialComponents;
|
||||
using Tizen.NET.MaterialComponents;
|
||||
using Xamarin.Forms.Material.Tizen;
|
||||
|
||||
namespace Xamarin.Forms
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using System;
|
||||
|
||||
namespace Xamarin.Forms.Platform.Tizen
|
||||
namespace Xamarin.Forms
|
||||
{
|
||||
[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
|
||||
public sealed class ExportCellAttribute : HandlerAttribute
|
||||
|
|
|
@ -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
|
|||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
using System;
|
||||
|
||||
namespace Xamarin.Forms.Platform.Tizen
|
||||
namespace Xamarin.Forms
|
||||
{
|
||||
[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
|
||||
public sealed class ExportImageSourceHandlerAttribute : HandlerAttribute
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using System;
|
||||
|
||||
namespace Xamarin.Forms.Platform.Tizen
|
||||
namespace Xamarin.Forms
|
||||
{
|
||||
[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
|
||||
public sealed class ExportRendererAttribute : HandlerAttribute
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
namespace Xamarin.Forms.Platform.Tizen
|
||||
namespace Xamarin.Forms
|
||||
{
|
||||
public enum TizenTitleBarVisibility
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using System;
|
||||
using ElmSharp;
|
||||
|
||||
namespace Xamarin.Forms.Platform.Tizen
|
||||
namespace Xamarin.Forms
|
||||
{
|
||||
public class ViewInitializedEventArgs : EventArgs
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче