From d1589348f8fbfa13398e16ced4d17c73bd206bd9 Mon Sep 17 00:00:00 2001 From: Kangho Hur Date: Thu, 26 Aug 2021 14:30:07 +0900 Subject: [PATCH] Fix build and runtime error after bumping to latest code --- .../Core/src/AppHostBuilderExtensions.cs | 3 +++ .../src/Tizen/Renderers/RefreshViewRenderer.cs | 1 + .../src/Core/HandlerImpl/Label/Label.Tizen.cs | 18 ------------------ .../Tizen/Extensions/ButtonExtensions.cs | 13 +++++++++++++ .../src/Handlers/Button/ButtonHandler.Tizen.cs | 4 ++++ .../src/Handlers/View/ViewHandlerOfT.Tizen.cs | 2 +- .../Platform/Tizen/FlowDirectionExtensions.cs | 13 +++++++++++++ 7 files changed, 35 insertions(+), 19 deletions(-) create mode 100644 src/Controls/src/Core/Platform/Tizen/Extensions/ButtonExtensions.cs create mode 100644 src/Core/src/Platform/Tizen/FlowDirectionExtensions.cs diff --git a/src/Compatibility/Core/src/AppHostBuilderExtensions.cs b/src/Compatibility/Core/src/AppHostBuilderExtensions.cs index 0430169ec17d..ff526e72bb48 100644 --- a/src/Compatibility/Core/src/AppHostBuilderExtensions.cs +++ b/src/Compatibility/Core/src/AppHostBuilderExtensions.cs @@ -154,6 +154,9 @@ static MauiAppBuilder SetupDefaults(this MauiAppBuilder builder) handlers.TryAddCompatibilityRenderer(typeof(ViewCell), typeof(ViewCellRenderer)); handlers.TryAddCompatibilityRenderer(typeof(SwitchCell), typeof(SwitchCellRenderer)); +#if TIZEN + handlers.TryAddCompatibilityRenderer(typeof(ContentView), typeof(LayoutRenderer)); +#else // This is for Layouts that currently don't work when assigned to LayoutHandler DependencyService.Register(); diff --git a/src/Compatibility/Core/src/Tizen/Renderers/RefreshViewRenderer.cs b/src/Compatibility/Core/src/Tizen/Renderers/RefreshViewRenderer.cs index 1ea12861a2e7..359a922120b1 100644 --- a/src/Compatibility/Core/src/Tizen/Renderers/RefreshViewRenderer.cs +++ b/src/Compatibility/Core/src/Tizen/Renderers/RefreshViewRenderer.cs @@ -1,6 +1,7 @@ using System; using System.Reflection; using System.Threading.Tasks; +using Microsoft.Maui.Layouts; using Microsoft.Maui.Graphics; using Microsoft.Maui.Controls.Platform; using ERect = ElmSharp.Rect; diff --git a/src/Controls/src/Core/HandlerImpl/Label/Label.Tizen.cs b/src/Controls/src/Core/HandlerImpl/Label/Label.Tizen.cs index 16e5d3887beb..a47cae4c91b8 100644 --- a/src/Controls/src/Core/HandlerImpl/Label/Label.Tizen.cs +++ b/src/Controls/src/Core/HandlerImpl/Label/Label.Tizen.cs @@ -5,24 +5,6 @@ namespace Microsoft.Maui.Controls { public partial class Label { - public static void RemapForControls() - { - // Adjust the mappings to preserve Controls.Label legacy behaviors - // ILabel does not include the TextType property, so we map it here to handle HTML text - // And we map some of the other property handlers to Controls-specific versions that avoid steppingon HTML text settings - - IPropertyMapper ControlsLabelMapper = new PropertyMapper(LabelHandler.LabelMapper) - { - [nameof(TextType)] = MapTextType, - [nameof(Text)] = MapText, - [nameof(TextDecorations)] = MapTextDecorations, - [nameof(ILabel.Font)] = MapFont, - [nameof(TextColor)] = MapTextColor - }; - - LabelHandler.LabelMapper = ControlsLabelMapper; - } - public static void MapTextType(LabelHandler handler, Label label) { handler.NativeView?.UpdateText(label); diff --git a/src/Controls/src/Core/Platform/Tizen/Extensions/ButtonExtensions.cs b/src/Controls/src/Core/Platform/Tizen/Extensions/ButtonExtensions.cs new file mode 100644 index 000000000000..cc979b645dbd --- /dev/null +++ b/src/Controls/src/Core/Platform/Tizen/Extensions/ButtonExtensions.cs @@ -0,0 +1,13 @@ +using static Microsoft.Maui.Controls.Button; +using EButton = ElmSharp.Button; + +namespace Microsoft.Maui.Controls.Platform +{ + public static class ButtonExtensions + { + public static void UpdateContentLayout(this EButton nativeButton, Button button) + { + //TODO : Need to impl + } + } +} \ No newline at end of file diff --git a/src/Core/src/Handlers/Button/ButtonHandler.Tizen.cs b/src/Core/src/Handlers/Button/ButtonHandler.Tizen.cs index dd65f1d82e97..5f7ac9c8e270 100644 --- a/src/Core/src/Handlers/Button/ButtonHandler.Tizen.cs +++ b/src/Core/src/Handlers/Button/ButtonHandler.Tizen.cs @@ -40,6 +40,10 @@ public static void MapTextColor(ButtonHandler handler, IButton button) handler.NativeView?.UpdateTextColor(button); } + //TODO : Need to impl + [MissingMapper] + public static void MapImageSource(ButtonHandler handler, IButton image) { } + [MissingMapper] public static void MapCharacterSpacing(ButtonHandler handler, IButton button) { } diff --git a/src/Core/src/Handlers/View/ViewHandlerOfT.Tizen.cs b/src/Core/src/Handlers/View/ViewHandlerOfT.Tizen.cs index f39199504559..b9d049a8b131 100644 --- a/src/Core/src/Handlers/View/ViewHandlerOfT.Tizen.cs +++ b/src/Core/src/Handlers/View/ViewHandlerOfT.Tizen.cs @@ -180,7 +180,7 @@ protected virtual void Dispose(bool disposing) if (disposing) { (this as IElementHandler)?.DisconnectHandler(); - NativeView?.Unrealize(); + base.NativeView?.Unrealize(); ContainerView?.Unrealize(); } diff --git a/src/Core/src/Platform/Tizen/FlowDirectionExtensions.cs b/src/Core/src/Platform/Tizen/FlowDirectionExtensions.cs new file mode 100644 index 000000000000..32e33025a324 --- /dev/null +++ b/src/Core/src/Platform/Tizen/FlowDirectionExtensions.cs @@ -0,0 +1,13 @@ +using System; +using ElmSharp; + +namespace Microsoft.Maui +{ + internal static class FlowDirectionExtensions + { + internal static void UpdateFlowDirection(this EvasObject nativeView, IView view) + { + // TODO: Need to impl + } + } +} \ No newline at end of file