Skip to content

Commit d505bb6

Browse files
krschaukrschau
committed
Update IDLs to work for both versions of Xaml
1 parent f13015e commit d505bb6

File tree

2 files changed

+82
-57
lines changed

2 files changed

+82
-57
lines changed

‎source/uwp/SharedObjectModel/idl/AdaptiveCards.ObjectModel.Shared.idl‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4+
#ifdef USE_WINUI3
5+
6+
#define Xaml_OM WinUI3
7+
8+
#else // !USE_WINUI3
9+
410
import "Windows.Foundation.idl";
511
import "Windows.Data.Json.idl";
612

7-
namespace AdaptiveCards.ObjectModel.Uwp
13+
#define Xaml_OM Uwp
14+
15+
#endif // USE_WINUI3
16+
17+
namespace AdaptiveCards.ObjectModel.Xaml_OM
818
{
919
runtimeclass AdaptiveCardParseResult;
1020

‎source/uwp/SharedRenderer/idl/AdaptiveCards.Rendering.Shared.idl‎

Lines changed: 71 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,32 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4+
#ifdef USE_WINUI3
5+
6+
#define Xaml_OM WinUI3
7+
#define xaml Microsoft.UI.Xaml
8+
9+
#else // !USE_WINUI3
10+
11+
#define Xaml_OM Uwp
12+
#define xaml Windows.UI.Xaml
13+
14+
import "Windows.Foundation.idl";
15+
import "Windows.Data.Json.idl";
16+
417
import "inspectable.idl";
518
import "Windows.Foundation.idl";
619
import "Windows.UI.Xaml.idl";
720
import "Windows.Data.Json.idl";
8-
import "AdaptiveCards.ObjectModel.Uwp.idl";
21+
import "AdaptiveCards.ObjectModel.Shared.idl";
22+
23+
#endif // USE_WINUI3
924

1025
namespace AdaptiveCards
1126
{
1227
namespace Rendering
1328
{
14-
namespace Uwp
29+
namespace Xaml_OM
1530
{
1631
runtimeclass AdaptiveHostConfigParseResult;
1732

@@ -47,7 +62,7 @@ namespace AdaptiveCards
4762

4863
AdaptiveCardResourceResolvers ResourceResolvers { get; };
4964
AdaptiveHostConfig HostConfig;
50-
Windows.UI.Xaml.ResourceDictionary OverrideStyles;
65+
xaml.ResourceDictionary OverrideStyles;
5166
AdaptiveFeatureRegistration FeatureRegistration;
5267

5368
Boolean OverflowMaxActions;
@@ -57,7 +72,7 @@ namespace AdaptiveCards
5772
void SetFixedDimensions(UInt32 desiredWidth, UInt32 desiredHeight);
5873
void ResetFixedDimensions();
5974

60-
RenderedAdaptiveCard RenderAdaptiveCard(AdaptiveCards.ObjectModel.Uwp.AdaptiveCard adaptiveCard);
75+
RenderedAdaptiveCard RenderAdaptiveCard(AdaptiveCards.ObjectModel.Xaml_OM.AdaptiveCard adaptiveCard);
6176
RenderedAdaptiveCard RenderAdaptiveCardFromJsonString(String adaptiveCard);
6277
RenderedAdaptiveCard RenderAdaptiveCardFromJson(Windows.Data.Json.JsonObject adaptiveCard);
6378

@@ -67,13 +82,13 @@ namespace AdaptiveCards
6782

6883
runtimeclass AdaptiveActionEventArgs
6984
{
70-
AdaptiveCards.ObjectModel.Uwp.IAdaptiveActionElement Action { get; };
85+
AdaptiveCards.ObjectModel.Xaml_OM.IAdaptiveActionElement Action { get; };
7186
AdaptiveInputs Inputs { get; };
7287
}
7388

7489
runtimeclass AdaptiveMediaEventArgs
7590
{
76-
AdaptiveCards.ObjectModel.Uwp.AdaptiveMedia Media { get; };
91+
AdaptiveCards.ObjectModel.Xaml_OM.AdaptiveMedia Media { get; };
7792
}
7893

7994
runtimeclass AdaptiveContainerStyleDefinition
@@ -166,11 +181,11 @@ namespace AdaptiveCards
166181

167182
interface IAdaptiveTextStyleConfig
168183
{
169-
AdaptiveCards.ObjectModel.Uwp.TextWeight Weight;
170-
AdaptiveCards.ObjectModel.Uwp.TextSize Size;
171-
AdaptiveCards.ObjectModel.Uwp.ForegroundColor Color;
184+
AdaptiveCards.ObjectModel.Xaml_OM.TextWeight Weight;
185+
AdaptiveCards.ObjectModel.Xaml_OM.TextSize Size;
186+
AdaptiveCards.ObjectModel.Xaml_OM.ForegroundColor Color;
172187
Boolean IsSubtle;
173-
AdaptiveCards.ObjectModel.Uwp.FontType FontType;
188+
AdaptiveCards.ObjectModel.Xaml_OM.FontType FontType;
174189
}
175190

176191
runtimeclass AdaptiveTextStyleConfig : [default] IAdaptiveTextStyleConfig { AdaptiveTextStyleConfig(); }
@@ -224,15 +239,15 @@ namespace AdaptiveCards
224239
{
225240
AdaptiveImageSetConfig();
226241

227-
AdaptiveCards.ObjectModel.Uwp.ImageSize ImageSize;
242+
AdaptiveCards.ObjectModel.Xaml_OM.ImageSize ImageSize;
228243
UInt32 MaxImageHeight;
229244
}
230245

231246
runtimeclass AdaptiveImageConfig
232247
{
233248
AdaptiveImageConfig();
234249

235-
AdaptiveCards.ObjectModel.Uwp.ImageSize ImageSize;
250+
AdaptiveCards.ObjectModel.Xaml_OM.ImageSize ImageSize;
236251
}
237252

238253
runtimeclass AdaptiveCardConfig
@@ -256,7 +271,7 @@ namespace AdaptiveCards
256271
AdaptiveShowCardActionConfig();
257272

258273
ActionMode ActionMode;
259-
AdaptiveCards.ObjectModel.Uwp.ContainerStyle Style;
274+
AdaptiveCards.ObjectModel.Xaml_OM.ContainerStyle Style;
260275
UInt32 InlineTopMargin;
261276
}
262277

@@ -269,7 +284,7 @@ namespace AdaptiveCards
269284
ActionAlignment ActionAlignment;
270285
UInt32 ButtonSpacing;
271286
UInt32 MaxActions;
272-
AdaptiveCards.ObjectModel.Uwp.Spacing Spacing;
287+
AdaptiveCards.ObjectModel.Xaml_OM.Spacing Spacing;
273288
IconPlacement IconPlacement;
274289
UInt32 IconSize;
275290
}
@@ -287,18 +302,18 @@ namespace AdaptiveCards
287302
{
288303
AdaptiveInputLabelConfig();
289304

290-
AdaptiveCards.ObjectModel.Uwp.ForegroundColor Color;
305+
AdaptiveCards.ObjectModel.Xaml_OM.ForegroundColor Color;
291306
Boolean IsSubtle;
292-
AdaptiveCards.ObjectModel.Uwp.TextSize Size;
307+
AdaptiveCards.ObjectModel.Xaml_OM.TextSize Size;
293308
String Suffix;
294-
AdaptiveCards.ObjectModel.Uwp.TextWeight Weight;
309+
AdaptiveCards.ObjectModel.Xaml_OM.TextWeight Weight;
295310
}
296311

297312
runtimeclass AdaptiveLabelConfig
298313
{
299314
AdaptiveLabelConfig();
300315

301-
AdaptiveCards.ObjectModel.Uwp.Spacing InputSpacing;
316+
AdaptiveCards.ObjectModel.Xaml_OM.Spacing InputSpacing;
302317

303318
AdaptiveInputLabelConfig RequiredInputs;
304319
AdaptiveInputLabelConfig OptionalInputs;
@@ -308,9 +323,9 @@ namespace AdaptiveCards
308323
{
309324
AdaptiveErrorMessageConfig();
310325

311-
AdaptiveCards.ObjectModel.Uwp.TextSize Size;
312-
AdaptiveCards.ObjectModel.Uwp.Spacing Spacing;
313-
AdaptiveCards.ObjectModel.Uwp.TextWeight Weight;
326+
AdaptiveCards.ObjectModel.Xaml_OM.TextSize Size;
327+
AdaptiveCards.ObjectModel.Xaml_OM.Spacing Spacing;
328+
AdaptiveCards.ObjectModel.Xaml_OM.TextWeight Weight;
314329
}
315330

316331
runtimeclass AdaptiveInputsConfig
@@ -369,7 +384,7 @@ namespace AdaptiveCards
369384
AdaptiveHostConfigParseResult();
370385

371386
AdaptiveHostConfig HostConfig { get; };
372-
Windows.Foundation.Collections.IVector<AdaptiveCards.ObjectModel.Uwp.AdaptiveError> Errors { get; };
387+
Windows.Foundation.Collections.IVector<AdaptiveCards.ObjectModel.Xaml_OM.AdaptiveError> Errors { get; };
373388
}
374389

375390
runtimeclass AdaptiveCardResourceResolvers
@@ -400,12 +415,12 @@ namespace AdaptiveCards
400415
{
401416
RenderedAdaptiveCard();
402417

403-
AdaptiveCards.ObjectModel.Uwp.AdaptiveCard OriginatingCard { get; };
418+
AdaptiveCards.ObjectModel.Xaml_OM.AdaptiveCard OriginatingCard { get; };
404419
AdaptiveHostConfig OriginatingHostConfig { get; };
405-
Windows.UI.Xaml.FrameworkElement FrameworkElement { get; };
420+
xaml.FrameworkElement FrameworkElement { get; };
406421
AdaptiveInputs UserInputs { get; };
407-
Windows.Foundation.Collections.IVector<AdaptiveCards.ObjectModel.Uwp.AdaptiveError> Errors { get; };
408-
Windows.Foundation.Collections.IVector<AdaptiveCards.ObjectModel.Uwp.AdaptiveWarning> Warnings { get; };
422+
Windows.Foundation.Collections.IVector<AdaptiveCards.ObjectModel.Xaml_OM.AdaptiveError> Errors { get; };
423+
Windows.Foundation.Collections.IVector<AdaptiveCards.ObjectModel.Xaml_OM.AdaptiveWarning> Warnings { get; };
409424

410425
event Windows.Foundation.TypedEventHandler<RenderedAdaptiveCard, AdaptiveActionEventArgs> Action;
411426
event Windows.Foundation.TypedEventHandler<RenderedAdaptiveCard, AdaptiveMediaEventArgs> MediaClicked;
@@ -418,7 +433,7 @@ namespace AdaptiveCards
418433
Windows.Data.Json.JsonObject AsJson();
419434
Windows.Foundation.Collections.ValueSet AsValueSet();
420435

421-
Boolean ValidateInputs(AdaptiveCards.ObjectModel.Uwp.IAdaptiveActionElement submitAction);
436+
Boolean ValidateInputs(AdaptiveCards.ObjectModel.Xaml_OM.IAdaptiveActionElement submitAction);
422437
}
423438

424439
runtimeclass AdaptiveFeatureRegistration
@@ -451,35 +466,35 @@ namespace AdaptiveCards
451466
AdaptiveActionInvoker();
452467
AdaptiveActionInvoker(RenderedAdaptiveCard renderResult);
453468

454-
void SendActionEvent(AdaptiveCards.ObjectModel.Uwp.IAdaptiveActionElement actionElement);
469+
void SendActionEvent(AdaptiveCards.ObjectModel.Xaml_OM.IAdaptiveActionElement actionElement);
455470
}
456471

457472
runtimeclass AdaptiveMediaEventInvoker
458473
{
459474
AdaptiveMediaEventInvoker();
460475
AdaptiveMediaEventInvoker(RenderedAdaptiveCard renderResult);
461476

462-
void SendMediaClickedEvent(AdaptiveCards.ObjectModel.Uwp.AdaptiveMedia mediaElement);
477+
void SendMediaClickedEvent(AdaptiveCards.ObjectModel.Xaml_OM.AdaptiveMedia mediaElement);
463478
}
464479

465480
runtimeclass AdaptiveRenderArgs
466481
{
467482
AdaptiveRenderArgs();
468483

469-
AdaptiveCards.ObjectModel.Uwp.ContainerStyle ContainerStyle;
484+
AdaptiveCards.ObjectModel.Xaml_OM.ContainerStyle ContainerStyle;
470485
IInspectable ParentElement;
471486
Boolean IsInShowCard;
472487
Boolean AllowAboveTitleIconPlacement;
473488
Boolean AncestorHasFallback;
474489
Boolean AddContainerPadding;
475-
AdaptiveCards.ObjectModel.Uwp.AdaptiveCard ParentCard;
490+
AdaptiveCards.ObjectModel.Xaml_OM.AdaptiveCard ParentCard;
476491
}
477492

478493
interface IAdaptiveInputValue
479494
{
480-
AdaptiveCards.ObjectModel.Uwp.IAdaptiveInputElement InputElement { get; };
495+
AdaptiveCards.ObjectModel.Xaml_OM.IAdaptiveInputElement InputElement { get; };
481496
String CurrentValue { get; };
482-
Windows.UI.Xaml.UIElement ErrorMessage
497+
xaml.UIElement ErrorMessage
483498
{
484499
get;
485500
set;
@@ -499,34 +514,34 @@ namespace AdaptiveCards
499514
AdaptiveCardResourceResolvers ResourceResolvers { get; };
500515
AdaptiveActionInvoker ActionInvoker { get; };
501516
AdaptiveMediaEventInvoker MediaEventInvoker { get; };
502-
Windows.UI.Xaml.ResourceDictionary OverrideStyles { get; };
517+
xaml.ResourceDictionary OverrideStyles { get; };
503518
AdaptiveInputs UserInputs { get; };
504519
Windows.Foundation.IReference<Boolean> Rtl;
505-
Windows.Foundation.IReference<AdaptiveCards.ObjectModel.Uwp.TextStyle> TextStyle;
506-
Windows.Foundation.IReference<AdaptiveCards.ObjectModel.Uwp.HAlignment> HorizontalContentAlignment;
520+
Windows.Foundation.IReference<AdaptiveCards.ObjectModel.Xaml_OM.TextStyle> TextStyle;
521+
Windows.Foundation.IReference<AdaptiveCards.ObjectModel.Xaml_OM.HAlignment> HorizontalContentAlignment;
507522

508523
void AddInputValue(IAdaptiveInputValue inputValue, AdaptiveRenderArgs renderArgs);
509-
void LinkSubmitActionToCard(AdaptiveCards.ObjectModel.Uwp.IAdaptiveActionElement submitAction,
524+
void LinkSubmitActionToCard(AdaptiveCards.ObjectModel.Xaml_OM.IAdaptiveActionElement submitAction,
510525
AdaptiveRenderArgs renderArgs);
511-
void LinkCardToParent(AdaptiveCards.ObjectModel.Uwp.AdaptiveCard card, AdaptiveRenderArgs renderArgs);
512-
IAdaptiveInputValue GetInputValue(AdaptiveCards.ObjectModel.Uwp.IAdaptiveInputElement inputElement);
526+
void LinkCardToParent(AdaptiveCards.ObjectModel.Xaml_OM.AdaptiveCard card, AdaptiveRenderArgs renderArgs);
527+
IAdaptiveInputValue GetInputValue(AdaptiveCards.ObjectModel.Xaml_OM.IAdaptiveInputElement inputElement);
513528

514-
void AddError(AdaptiveCards.ObjectModel.Uwp.ErrorStatusCode statusCode, String message);
515-
void AddWarning(AdaptiveCards.ObjectModel.Uwp.WarningStatusCode statusCode, String message);
529+
void AddError(AdaptiveCards.ObjectModel.Xaml_OM.ErrorStatusCode statusCode, String message);
530+
void AddWarning(AdaptiveCards.ObjectModel.Xaml_OM.WarningStatusCode statusCode, String message);
516531
}
517532

518533
interface IAdaptiveElementRenderer
519534
{
520-
Windows.UI.Xaml.UIElement Render(AdaptiveCards.ObjectModel.Uwp.IAdaptiveCardElement element,
521-
AdaptiveRenderContext context,
522-
AdaptiveRenderArgs renderArgs);
535+
xaml.UIElement Render(AdaptiveCards.ObjectModel.Xaml_OM.IAdaptiveCardElement element,
536+
AdaptiveRenderContext context,
537+
AdaptiveRenderArgs renderArgs);
523538
}
524539

525540
interface IAdaptiveActionRenderer
526541
{
527-
Windows.UI.Xaml.UIElement Render(AdaptiveCards.ObjectModel.Uwp.IAdaptiveActionElement element,
528-
AdaptiveRenderContext context,
529-
AdaptiveRenderArgs renderArgs);
542+
xaml.UIElement Render(AdaptiveCards.ObjectModel.Xaml_OM.IAdaptiveActionElement element,
543+
AdaptiveRenderContext context,
544+
AdaptiveRenderArgs renderArgs);
530545
}
531546

532547
[default_interface] runtimeclass AdaptiveTableRenderer : IAdaptiveElementRenderer
@@ -639,17 +654,17 @@ namespace AdaptiveCards
639654
AdaptiveToggleVisibilityActionRenderer();
640655
}
641656

642-
runtimeclass TileControl : Windows.UI.Xaml.Controls.ContentControl
657+
runtimeclass TileControl : xaml.Controls.ContentControl
643658
{
644659
TileControl();
645660

646-
Windows.UI.Xaml.UIElement ResolvedImage { get; };
647-
AdaptiveCards.ObjectModel.Uwp.AdaptiveBackgroundImage BackgroundImage;
661+
xaml.UIElement ResolvedImage { get; };
662+
AdaptiveCards.ObjectModel.Xaml_OM.AdaptiveBackgroundImage BackgroundImage;
648663
Windows.Foundation.Size ImageSize;
649-
void LoadImageBrush(Windows.UI.Xaml.UIElement uielement);
664+
void LoadImageBrush(xaml.UIElement uielement);
650665
}
651666

652-
runtimeclass WholeItemsPanel : Windows.UI.Xaml.Controls.Panel
667+
runtimeclass WholeItemsPanel : xaml.Controls.Panel
653668
{
654669
WholeItemsPanel();
655670

@@ -662,10 +677,10 @@ namespace AdaptiveCards
662677
{
663678
ElementTagContent();
664679

665-
Windows.UI.Xaml.Controls.ColumnDefinition ColumnDefinition { get; };
666-
AdaptiveCards.ObjectModel.Uwp.IAdaptiveCardElement CardElement { get; };
667-
Windows.UI.Xaml.UIElement Separator { get; };
668-
Windows.UI.Xaml.Controls.Panel ParentPanel { get; };
680+
xaml.Controls.ColumnDefinition ColumnDefinition { get; };
681+
AdaptiveCards.ObjectModel.Xaml_OM.IAdaptiveCardElement CardElement { get; };
682+
xaml.UIElement Separator { get; };
683+
xaml.Controls.Panel ParentPanel { get; };
669684
Boolean ExpectedVisibility;
670685
Boolean IsStretchable;
671686
}

0 commit comments

Comments
 (0)