Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Compatibility/Core/src/AppHostBuilderExtensions.Tizen.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Maui.Controls.Compatibility;
using Microsoft.Maui.Hosting;
using Microsoft.Maui.LifecycleEvents;
using Microsoft.Maui.Controls.Compatibility;
using Microsoft.Extensions.DependencyInjection;
using TDeviceInfo = Tizen.UIExtensions.Common.DeviceInfo;

namespace Microsoft.Maui.Controls.Compatibility.Hosting
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.Maui.Graphics;
using TColor = Tizen.UIExtensions.Common.Color;
using NColor = Tizen.NUI.Color;
using TColor = Tizen.UIExtensions.Common.Color;

namespace Microsoft.Maui.Controls.Compatibility.Platform.Tizen
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Microsoft.Maui.Graphics;
using NSize = Tizen.NUI.Size2D;
using Rect = Microsoft.Maui.Graphics.Rect;
using TRect = Tizen.UIExtensions.Common.Rect;
using TSize = Tizen.UIExtensions.Common.Size;
using NSize = Tizen.NUI.Size2D;

namespace Microsoft.Maui.Controls.Compatibility.Platform.Tizen
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Collections.Generic;
using SkiaSharp;
using Microsoft.Maui.Controls.Shapes;
using Rect = Microsoft.Maui.Graphics.Rect;
using SkiaSharp;
using Point = Microsoft.Maui.Graphics.Point;
using Rect = Microsoft.Maui.Graphics.Rect;


namespace Microsoft.Maui.Controls.Compatibility.Platform.Tizen
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using SkiaSharp;
using Microsoft.Maui.Controls.Shapes;
using SkiaSharp;

namespace Microsoft.Maui.Controls.Compatibility.Platform.Tizen
{
Expand Down
4 changes: 2 additions & 2 deletions src/Compatibility/Core/src/Tizen/Forms.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
using System.Reflection;
using Microsoft.Maui.Controls.Compatibility.Platform.Tizen;
using Microsoft.Maui.Controls.Internals;
using Tizen.Applications;
using Microsoft.Maui.Devices;
using Tizen.Applications;
using Color = Microsoft.Maui.Graphics.Color;
using NView = Tizen.NUI.BaseComponents.View;
using TDeviceInfo = Tizen.UIExtensions.Common.DeviceInfo;
using Size = Microsoft.Maui.Graphics.Size;
using TDeviceInfo = Tizen.UIExtensions.Common.DeviceInfo;

namespace Microsoft.Maui.Controls.Compatibility
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using GestureStateType = Tizen.NUI.Gesture.StateType;
using NGestureDetector = Tizen.NUI.GestureDetector;
using PanGestureDetector = Tizen.NUI.PanGestureDetector;
using GestureStateType = Tizen.NUI.Gesture.StateType;

namespace Microsoft.Maui.Controls.Compatibility.Platform.Tizen
{
Expand Down
4 changes: 2 additions & 2 deletions src/Compatibility/Core/src/Tizen/Renderers/BoxViewRenderer.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using NView = Tizen.NUI.BaseComponents.View;
using Tizen.UIExtensions.NUI;
using Microsoft.Maui.Controls.Platform;
using Tizen.UIExtensions.NUI;
using NView = Tizen.NUI.BaseComponents.View;

namespace Microsoft.Maui.Controls.Compatibility.Platform.Tizen
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
using System.ComponentModel;
using System.Linq;
using Microsoft.Maui.Controls.Internals;
using Size = Microsoft.Maui.Graphics.Size;
using Rect = Microsoft.Maui.Graphics.Rect;
using Point = Microsoft.Maui.Graphics.Point;
using Microsoft.Maui.Controls.Platform;
using Tizen.NUI;
using Tizen.UIExtensions.Common;
using Specific = Microsoft.Maui.Controls.PlatformConfiguration.TizenSpecific.VisualElement;
using XFocusDirection = Microsoft.Maui.Controls.PlatformConfiguration.TizenSpecific.FocusDirection;
using Tizen.UIExtensions.NUI;
using NView = Tizen.NUI.BaseComponents.View;
using Point = Microsoft.Maui.Graphics.Point;
using Rect = Microsoft.Maui.Graphics.Rect;
using Size = Microsoft.Maui.Graphics.Size;
using Specific = Microsoft.Maui.Controls.PlatformConfiguration.TizenSpecific.VisualElement;
using TPoint = Tizen.UIExtensions.Common.Point;
using Tizen.UIExtensions.NUI;
using XFocusDirection = Microsoft.Maui.Controls.PlatformConfiguration.TizenSpecific.FocusDirection;

namespace Microsoft.Maui.Controls.Compatibility.Platform.Tizen
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
using Microsoft.Maui.Controls.Handlers.Items;
using Microsoft.Maui.Controls.Platform;
using Tizen.UIExtensions.NUI;
using IMeasurable = Tizen.UIExtensions.Common.IMeasurable;
using Size = Microsoft.Maui.Graphics.Size;
using TCollectionView = Tizen.UIExtensions.NUI.CollectionView;
using TItemSizingStrategy = Tizen.UIExtensions.NUI.ItemSizingStrategy;
using IMeasurable = Tizen.UIExtensions.Common.IMeasurable;
using TSize = Tizen.UIExtensions.Common.Size;

namespace Microsoft.Maui.Controls.Handlers.Compatibility
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/src/Core/HandlerImpl/Label/Label.Tizen.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#nullable disable
using Microsoft.Maui;
using Microsoft.Maui.Handlers;
using Microsoft.Maui.Controls.Platform;
using Microsoft.Maui.Handlers;

namespace Microsoft.Maui.Controls
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
using GColor = Microsoft.Maui.Graphics.Color;
using GColors = Microsoft.Maui.Graphics.Colors;
using NCollectionView = Tizen.UIExtensions.NUI.CollectionView;
using NLayoutParamPolicies = Tizen.NUI.BaseComponents.LayoutParamPolicies;
using NItemSizingStrategy = Tizen.UIExtensions.NUI.ItemSizingStrategy;
using NLayoutParamPolicies = Tizen.NUI.BaseComponents.LayoutParamPolicies;
using NView = Tizen.NUI.BaseComponents.View;
using XLabel = Microsoft.Maui.Controls.Label;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#nullable disable
using Microsoft.Maui.Controls.Internals;
using Tizen.UIExtensions.NUI;
using TEntry = Tizen.UIExtensions.NUI.Entry;
using TEditor = Tizen.UIExtensions.NUI.Editor;
using TLabel = Tizen.UIExtensions.NUI.Label;
using TEntry = Tizen.UIExtensions.NUI.Entry;
using TFormattedString = Tizen.UIExtensions.Common.FormattedString;
using TLabel = Tizen.UIExtensions.NUI.Label;
using TSpan = Tizen.UIExtensions.Common.Span;

namespace Microsoft.Maui.Controls.Platform
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Fonts/FontManager.Tizen.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.IO;
using System.Collections.Concurrent;
using System.IO;

namespace Microsoft.Maui
{
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Handlers/Picker/PickerHandler.Tizen.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Tizen.NUI;
using Tizen.UIExtensions.NUI;
using NColor = Tizen.NUI.Color;
using NEntry = Tizen.UIExtensions.NUI.Entry;
using NPosition = Tizen.NUI.Position;
using NView = Tizen.NUI.BaseComponents.View;
using NEntry = Tizen.UIExtensions.NUI.Entry;

namespace Microsoft.Maui.Handlers
{
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Handlers/View/ViewHandlerOfT.Tizen.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using Tizen.UIExtensions.Common;
using Tizen.UIExtensions.NUI;
using NView = Tizen.NUI.BaseComponents.View;
using Rect = Microsoft.Maui.Graphics.Rect;
using Size = Microsoft.Maui.Graphics.Size;
using NView = Tizen.NUI.BaseComponents.View;
using TSize = Tizen.UIExtensions.Common.Size;

namespace Microsoft.Maui.Handlers
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Handlers/ViewHandlerExtensions.Tizen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
using Microsoft.Maui.Graphics;
using Tizen.UIExtensions.NUI;
using IMeasurable = Tizen.UIExtensions.Common.IMeasurable;
using NMeasuredSize = Tizen.NUI.MeasuredSize;
using NLayoutLength = Tizen.NUI.LayoutLength;
using NMeasuredSize = Tizen.NUI.MeasuredSize;

namespace Microsoft.Maui
{
Expand Down
4 changes: 2 additions & 2 deletions src/Core/src/Platform/Tizen/ColorExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.Maui.Graphics;
using TLog = Tizen.UIExtensions.Common.Log;
using TColor = Tizen.UIExtensions.Common.Color;
using NColor = Tizen.NUI.Color;
using TColor = Tizen.UIExtensions.Common.Color;
using TLog = Tizen.UIExtensions.Common.Log;

namespace Microsoft.Maui.Platform
{
Expand Down
4 changes: 2 additions & 2 deletions src/Core/src/Platform/Tizen/DPExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System;
using Microsoft.Maui.Graphics;
using DeviceInfo = Tizen.UIExtensions.Common.DeviceInfo;
using NRectangle = Tizen.NUI.Rectangle;
using TPoint = Tizen.UIExtensions.Common.Point;
using TRect = Tizen.UIExtensions.Common.Rect;
using TSize = Tizen.UIExtensions.Common.Size;
using TPoint = Tizen.UIExtensions.Common.Point;
using DeviceInfo = Tizen.UIExtensions.Common.DeviceInfo;

namespace Microsoft.Maui.Platform
{
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/Tizen/ImageSourcePartExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using TImage = Tizen.NUI.BaseComponents.ImageView;
using NView = Tizen.NUI.BaseComponents.View;
using TImage = Tizen.NUI.BaseComponents.ImageView;

namespace Microsoft.Maui.Platform
{
Expand Down
4 changes: 2 additions & 2 deletions src/Core/src/Platform/Tizen/KeyboardExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using TKeyboard = Tizen.UIExtensions.Common.Keyboard;
using AutoCapital = Tizen.NUI.InputMethod.AutoCapitalType;
using AutoCapital = Tizen.NUI.InputMethod.AutoCapitalType;
using TKeyboard = Tizen.UIExtensions.Common.Keyboard;

namespace Microsoft.Maui.Platform
{
Expand Down
8 changes: 4 additions & 4 deletions src/Core/src/Platform/Tizen/LabelExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Tizen.UIExtensions.Common;
using Microsoft.Maui.Graphics;
using Tizen.NUI;
using Tizen.UIExtensions.Common;
using Tizen.UIExtensions.NUI;
using NColor = Tizen.UIExtensions.Common.Color;
using TLineBreakMode = Tizen.UIExtensions.Common.LineBreakMode;
using TTextDecorationse = Tizen.UIExtensions.Common.TextDecorations;
using Microsoft.Maui.Graphics;
using Tizen.NUI;
using NColor = Tizen.UIExtensions.Common.Color;

namespace Microsoft.Maui.Platform
{
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/Tizen/LayoutViewGroup.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using Tizen.UIExtensions.NUI;
using Tizen.UIExtensions.Common;
using Tizen.UIExtensions.NUI;
using Rect = Microsoft.Maui.Graphics.Rect;
using Size = Microsoft.Maui.Graphics.Size;
using TSize = Tizen.UIExtensions.Common.Size;
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/Tizen/MauiApplication.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
using Tizen.Applications;
using Tizen.NUI;
using IOPath = System.IO.Path;
using TApplication = Tizen.Applications.Application;
using NView = Tizen.NUI.BaseComponents.View;
using TApplication = Tizen.Applications.Application;

namespace Microsoft.Maui
{
Expand Down
4 changes: 2 additions & 2 deletions src/Core/src/Platform/Tizen/MauiClipperView.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Tizen.UIExtensions.NUI;
using Microsoft.Maui.Graphics;
using Microsoft.Maui.Graphics;
using Microsoft.Maui.Graphics.Skia;
using Tizen.UIExtensions.Common;
using Tizen.UIExtensions.NUI;
using Rect = Microsoft.Maui.Graphics.Rect;

namespace Microsoft.Maui.Platform
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/Tizen/MauiContextExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.Extensions.DependencyInjection;
using Tizen.UIExtensions.NUI;
using Tizen.NUI;
using Tizen.UIExtensions.NUI;

namespace Microsoft.Maui.Platform
{
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/Tizen/MauiDateTimePicker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
using Tizen.NUI.Components;
using Tizen.UIExtensions.NUI;
using NButton = Tizen.UIExtensions.NUI.Button;
using NView = Tizen.NUI.BaseComponents.View;
using NFontAttributes = Tizen.UIExtensions.Common.FontAttributes;
using NTextAlignment = Tizen.UIExtensions.Common.TextAlignment;
using NView = Tizen.NUI.BaseComponents.View;
using TColor = Tizen.UIExtensions.Common.Color;

namespace Microsoft.Maui.Platform
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/Tizen/MauiPicker.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.ComponentModel;
using System.Runtime.CompilerServices;
using Tizen.NUI;
using NColor = Tizen.NUI.Color;
using NEntry = Tizen.UIExtensions.NUI.Entry;
using NView = Tizen.NUI.BaseComponents.View;
using NColor = Tizen.NUI.Color;

namespace Microsoft.Maui.Platform
{
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/Tizen/MauiSearchBar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
using Tizen.NUI;
using Tizen.UIExtensions.Common;
using Tizen.UIExtensions.NUI;
using NColor = Tizen.NUI.Color;
using TSize = Tizen.UIExtensions.Common.Size;
using TTextAlignment = Tizen.UIExtensions.Common.TextAlignment;
using NColor = Tizen.NUI.Color;

namespace Microsoft.Maui.Platform
{
Expand Down
4 changes: 2 additions & 2 deletions src/Core/src/Platform/Tizen/MauiShapeView.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Tizen.UIExtensions.Common;
using Microsoft.Maui.Graphics.Skia.Views;
using Microsoft.Maui.Graphics.Skia.Views;
using Tizen.UIExtensions.Common;

namespace Microsoft.Maui.Platform
{
Expand Down
6 changes: 3 additions & 3 deletions src/Core/src/Platform/Tizen/MauiStepper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
using Tizen.NUI.BaseComponents;
using Tizen.UIExtensions.Common;
using Tizen.UIExtensions.NUI;
using MaterialIconButton = Tizen.UIExtensions.NUI.GraphicsView.MaterialIconButton;
using MaterialIcons = Tizen.UIExtensions.Common.GraphicsView.MaterialIcons;
using NColor = Tizen.NUI.Color;
using NView = Tizen.NUI.BaseComponents.View;
using TColor = Tizen.UIExtensions.Common.Color;
using NColor = Tizen.NUI.Color;
using TSize = Tizen.UIExtensions.Common.Size;
using MaterialIcons = Tizen.UIExtensions.Common.GraphicsView.MaterialIcons;
using MaterialIconButton = Tizen.UIExtensions.NUI.GraphicsView.MaterialIconButton;

namespace Microsoft.Maui.Platform
{
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/Tizen/ScrollViewExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Tizen.UIExtensions.NUI;
using TScrollOrientation = Tizen.UIExtensions.Common.ScrollOrientation;
using TScrollBarVisibility = Tizen.UIExtensions.Common.ScrollBarVisibility;
using TScrollOrientation = Tizen.UIExtensions.Common.ScrollOrientation;

namespace Microsoft.Maui.Platform
{
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/Tizen/ToolbarExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Tizen.UIExtensions.Common.GraphicsView;
using TMaterialIconButton = Tizen.UIExtensions.NUI.GraphicsView.MaterialIconButton;
using TColor = Tizen.UIExtensions.Common.Color;
using TMaterialIconButton = Tizen.UIExtensions.NUI.GraphicsView.MaterialIconButton;

namespace Microsoft.Maui.Platform
{
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/iOS/ViewExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ static void UpdateBackgroundLayerFrame(CALayer layer, CGRect bounds)
{
if (layer == null || layer.Sublayers == null || layer.Sublayers.Length == 0)
return;

foreach (var sublayer in layer.Sublayers)
{
if (sublayer.Name == BackgroundLayerName && sublayer.Frame != bounds)
Expand Down
8 changes: 4 additions & 4 deletions src/Core/tests/Benchmarks.Droid/MainInstrumentation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ static bool Run()
bool success = false;
try
{
var config = ManualConfig.CreateMinimumViable()
.AddJob(Job.Default.WithToolchain(new InProcessEmitToolchain(TimeSpan.FromMinutes(10), logOutput: true)))
.AddDiagnoser(MemoryDiagnoser.Default)
.WithOrderer(new DefaultOrderer(SummaryOrderPolicy.FastestToSlowest, MethodOrderPolicy.Alphabetical));
var config = ManualConfig.CreateMinimumViable()
.AddJob(Job.Default.WithToolchain(new InProcessEmitToolchain(TimeSpan.FromMinutes(10), logOutput: true)))
.AddDiagnoser(MemoryDiagnoser.Default)
.WithOrderer(new DefaultOrderer(SummaryOrderPolicy.FastestToSlowest, MethodOrderPolicy.Alphabetical));

// ImageBenchmark class is hardcoded here for now
BenchmarkRunner.Run<ImageBenchmark>(config);
Expand Down
2 changes: 1 addition & 1 deletion src/Essentials/src/Map/Map.tizen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
using System.Globalization;
using System.Linq;
using System.Threading.Tasks;
using Tizen.Applications;
using Microsoft.Maui.Devices.Sensors;
using Tizen.Applications;

namespace Microsoft.Maui.ApplicationModel
{
Expand Down