From 44467015b4cb2c8c97d07e4a8b3107043551f29b Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Tue, 21 Mar 2023 16:11:20 -0700 Subject: [PATCH] Add conditional for Uno for ResourceNameToResourceStringConverter Map to code from https://github.com/unoplatform/Uno.WindowsCommunityToolkit/blob/uno/CommunityToolkit.WinUI.UI/Converters/ResourceNameToResourceStringConverter.cs for Uno.WinUI, not sure for Uno.UI --- .../src/ResourceNameToResourceStringConverter.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/components/Converters/src/ResourceNameToResourceStringConverter.cs b/components/Converters/src/ResourceNameToResourceStringConverter.cs index 77d4f479..c1068d28 100644 --- a/components/Converters/src/ResourceNameToResourceStringConverter.cs +++ b/components/Converters/src/ResourceNameToResourceStringConverter.cs @@ -2,7 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#if WINAPPSDK +// TODO: Need to better understand how this works/maps on Uno between Uno.UI/Uno.WinUI, +// This should be the equivelant code from Uno.WinUI from: https://github.com/unoplatform/Uno.WindowsCommunityToolkit/blob/uno/CommunityToolkit.WinUI.UI/Converters/ResourceNameToResourceStringConverter.cs +#if WINAPPSDK && !HAS_UNO using Microsoft.Windows.ApplicationModel.Resources; #else using Windows.ApplicationModel.Resources; @@ -15,7 +17,7 @@ namespace CommunityToolkit.WinUI.Converters; /// public sealed class ResourceNameToResourceStringConverter : IValueConverter { -#if WINAPPSDK +#if WINAPPSDK && !HAS_UNO private readonly ResourceManager _resourceManager = new ResourceManager(); #else private readonly ResourceLoader _resourceLoader = ResourceLoader.GetForViewIndependentUse(); @@ -37,7 +39,7 @@ public object Convert(object value, Type targetType, object parameter, string la return string.Empty; } -#if WINAPPSDK +#if WINAPPSDK && !HAS_UNO return _resourceManager.MainResourceMap.TryGetValue(value.ToString()).ValueAsString; #else return _resourceLoader.GetString(value.ToString());