[UWP] Clean up XamlBuilder

source/uwp/Renderer/AdaptiveCardRenderer.vcxproj

@@ -126,9 +126,12 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="lib\ActionHelpers.cpp" />
     <ClCompile Include="lib\AdaptiveHighlightColorConfig.cpp" />
     <ClCompile Include="lib\AdaptiveRequirement.cpp" />
     <ClCompile Include="lib\ElementTagContent.cpp" />
+    <ClCompile Include="lib\XamlHelpers.cpp" />
+    <ClInclude Include="lib\ActionHelpers.h" />
     <ClInclude Include="lib\AdaptiveActionElement.h" />
     <ClInclude Include="lib\AdaptiveActionInvoker.h" />
     <ClInclude Include="lib\AdaptiveActionParserRegistration.h" />

source/uwp/Renderer/AdaptiveCardRenderer.vcxproj.filters

@@ -112,6 +112,8 @@
     <ClCompile Include="lib\AdaptiveFontTypeDefinition.cpp" />
     <ClCompile Include="lib\AdaptiveFontTypesDefinition.cpp" />
     <ClCompile Include="lib\AdaptiveRequirement.cpp" />
+    <ClCompile Include="lib\ActionHelpers.cpp" />
+    <ClCompile Include="lib\XamlHelpers.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="lib\AdaptiveCard.h" />
@@ -231,8 +233,9 @@
     <ClInclude Include="lib\AdaptiveFontTypeDefinition.h" />
     <ClInclude Include="lib\AdaptiveFontTypesDefinition.h" />
     <ClInclude Include="lib\AdaptiveRequirement.h" />
+    <ClInclude Include="lib\ActionHelpers.h" />
   </ItemGroup>
   <ItemGroup>
     <Midl Include="idl\AdaptiveCards.Rendering.Uwp.idl" />
   </ItemGroup>
-</Project>
+</Project>

source/uwp/Renderer/lib/ActionHelpers.h

@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+#pragma once
+
+namespace AdaptiveNamespace::ActionHelpers
+{
+    HRESULT BuildAction(_In_ ABI::AdaptiveNamespace::IAdaptiveActionElement* adaptiveActionElement,
+                        _In_ ABI::AdaptiveNamespace::IAdaptiveRenderContext* renderContext,
+                        _In_ ABI::AdaptiveNamespace::IAdaptiveRenderArgs* renderArgs,
+                        _Outptr_ ABI::Windows::UI::Xaml::IUIElement** actionControl);
+
+    HRESULT GetButtonMargin(_In_ ABI::AdaptiveNamespace::IAdaptiveActionsConfig* actionsConfig,
+                            ABI::Windows::UI::Xaml::Thickness& buttonMargin) noexcept;
+
+    void ArrangeButtonContent(_In_ ABI::AdaptiveNamespace::IAdaptiveActionElement* action,
+                              _In_ ABI::AdaptiveNamespace::IAdaptiveActionsConfig* actionsConfig,
+                              _In_ ABI::AdaptiveNamespace::IAdaptiveRenderContext* renderContext,
+                              ABI::AdaptiveNamespace::ContainerStyle containerStyle,
+                              _In_ ABI::AdaptiveNamespace::IAdaptiveHostConfig* hostConfig,
+                              bool allActionsHaveIcons,
+                              _In_ ABI::Windows::UI::Xaml::Controls::IButton* button);
+
+    HRESULT SetMatchingHeight(_In_ ABI::Windows::UI::Xaml::IFrameworkElement* elementToChange,
+                              _In_ ABI::Windows::UI::Xaml::IFrameworkElement* elementToMatch);
+
+    HRESULT HandleActionStyling(_In_ ABI::AdaptiveNamespace::IAdaptiveActionElement* adaptiveActionElement,
+                                _In_ ABI::Windows::UI::Xaml::IFrameworkElement* buttonFrameworkElement,
+                                _In_ ABI::AdaptiveNamespace::IAdaptiveRenderContext* renderContext);
+
+    bool WarnForInlineShowCard(_In_ ABI::AdaptiveNamespace::IAdaptiveRenderContext* renderContext,
+                               _In_ ABI::AdaptiveNamespace::IAdaptiveActionElement* action,
+                               const std::wstring& warning);
+
+    void HandleInlineAction(_In_ ABI::AdaptiveNamespace::IAdaptiveRenderContext* renderContext,
+                            _In_ ABI::AdaptiveNamespace::IAdaptiveRenderArgs* renderArgs,
+                            _In_ ABI::Windows::UI::Xaml::Controls::ITextBox* textBox,
+                            _In_ ABI::AdaptiveNamespace::IAdaptiveActionElement* inlineAction,
+                            _COM_Outptr_ ABI::Windows::UI::Xaml::IUIElement** textBoxWithInlineAction);
+}

source/uwp/Renderer/lib/AdaptiveActionElement.cpp

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 #include "pch.h"
 #include "AdaptiveActionElement.h"
-#include "Util.h"
 
 using namespace Microsoft::WRL;
 using namespace Microsoft::WRL::Wrappers;

source/uwp/Renderer/lib/AdaptiveActionElement.h

@@ -2,10 +2,6 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "AdaptiveCards.Rendering.Uwp.h"
-#include <windows.foundation.h>
-#include "Enums.h"
-
 namespace AdaptiveNamespace
 {
     class DECLSPEC_UUID("CDCCC115-7C53-4A04-9F5B-754BBC00C80E") AdaptiveActionElementBase : public IUnknown

source/uwp/Renderer/lib/AdaptiveActionSet.cpp

@@ -3,32 +3,26 @@
 #include "pch.h"
 #include "AdaptiveActionSet.h"
 
-#include "Util.h"
-#include "Vector.h"
-#include <windows.foundation.collections.h>
-
 using namespace Microsoft::WRL;
 using namespace Microsoft::WRL::Wrappers;
 using namespace ABI::AdaptiveNamespace;
 using namespace ABI::Windows::Foundation::Collections;
 using namespace ABI::Windows::UI::Xaml;
 using namespace ABI::Windows::UI::Xaml::Controls;
 
-namespace AdaptiveCards { namespace Rendering { namespace Uwp
+namespace AdaptiveNamespace
 {
-    AdaptiveActionSet::AdaptiveActionSet()
-    {
-        m_actions = Microsoft::WRL::Make<Vector<IAdaptiveActionElement*>>();
-    }
+    AdaptiveActionSet::AdaptiveActionSet() { m_actions = Microsoft::WRL::Make<Vector<IAdaptiveActionElement*>>(); }
 
     HRESULT AdaptiveActionSet::RuntimeClassInitialize() noexcept try
     {
         std::shared_ptr<AdaptiveCards::ActionSet> ActionSet = std::make_shared<AdaptiveCards::ActionSet>();
         return RuntimeClassInitialize(ActionSet);
-    } CATCH_RETURN;
+    }
+    CATCH_RETURN;
 
-    _Use_decl_annotations_
-    HRESULT AdaptiveActionSet::RuntimeClassInitialize(const std::shared_ptr<AdaptiveCards::ActionSet>& sharedActionSet) try
+    _Use_decl_annotations_ HRESULT AdaptiveActionSet::RuntimeClassInitialize(const std::shared_ptr<AdaptiveCards::ActionSet>& sharedActionSet)
+    try
     {
         if (sharedActionSet == nullptr)
         {
@@ -38,22 +32,22 @@ namespace AdaptiveCards { namespace Rendering { namespace Uwp
         RETURN_IF_FAILED(GenerateActionsProjection(sharedActionSet->GetActions(), m_actions.Get()));
         InitializeBaseElement(std::static_pointer_cast<BaseCardElement>(sharedActionSet));
         return S_OK;
-    } CATCH_RETURN;
+    }
+    CATCH_RETURN;
 
-    _Use_decl_annotations_
-    HRESULT AdaptiveActionSet::get_Actions(IVector<IAdaptiveActionElement*>** items)
+    _Use_decl_annotations_ HRESULT AdaptiveActionSet::get_Actions(IVector<IAdaptiveActionElement*>** items)
     {
         return m_actions.CopyTo(items);
     }
 
-    _Use_decl_annotations_
-    HRESULT AdaptiveActionSet::get_ElementType(ElementType* elementType)
+    _Use_decl_annotations_ HRESULT AdaptiveActionSet::get_ElementType(ElementType* elementType)
     {
         *elementType = ElementType::ActionSet;
         return S_OK;
     }
 
-    HRESULT AdaptiveActionSet::GetSharedModel(std::shared_ptr<AdaptiveCards::BaseCardElement>& sharedModel) try
+    HRESULT AdaptiveActionSet::GetSharedModel(std::shared_ptr<AdaptiveCards::BaseCardElement>& sharedModel)
+    try
     {
         std::shared_ptr<AdaptiveCards::ActionSet> actionSet = std::make_shared<AdaptiveCards::ActionSet>();
         RETURN_IF_FAILED(SetSharedElementProperties(std::static_pointer_cast<AdaptiveCards::BaseCardElement>(actionSet)));
@@ -62,5 +56,6 @@ namespace AdaptiveCards { namespace Rendering { namespace Uwp
 
         sharedModel = actionSet;
         return S_OK;
-    }CATCH_RETURN;
-}}}
+    }
+    CATCH_RETURN;
+}

source/uwp/Renderer/lib/AdaptiveActionSet.h

@@ -2,11 +2,7 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "AdaptiveCards.Rendering.Uwp.h"
-#include "Enums.h"
 #include "ActionSet.h"
-#include <windows.foundation.h>
-#include "AdaptiveCardElement.h"
 
 namespace AdaptiveNamespace
 {
@@ -17,9 +13,10 @@ namespace AdaptiveNamespace
                                               Microsoft::WRL::CloakedIid<ITypePeek>,
                                               Microsoft::WRL::CloakedIid<AdaptiveNamespace::AdaptiveCardElementBase>>
     {
-        InspectableClass(RuntimeClass_AdaptiveCards_Rendering_Uwp_AdaptiveActionSet, BaseTrust)
+        InspectableClass(RuntimeClass_AdaptiveCards_Rendering_Uwp_AdaptiveActionSet, BaseTrust);
 
-            public : AdaptiveActionSet();
+    public:
+        AdaptiveActionSet();
         HRESULT RuntimeClassInitialize() noexcept;
         HRESULT RuntimeClassInitialize(_In_ const std::shared_ptr<AdaptiveCards::ActionSet>& sharedActionSet);
 

source/uwp/Renderer/lib/AdaptiveActionSetRenderer.cpp

@@ -4,15 +4,20 @@
 
 #include "AdaptiveActionSet.h"
 #include "AdaptiveActionSetRenderer.h"
+#include "AdaptiveShowCardActionRenderer.h"
 #include "AdaptiveElementParserRegistration.h"
-#include "enums.h"
-#include "Util.h"
-#include "XamlBuilder.h"
+#include "AdaptiveImage.h"
+#include "AdaptiveRenderArgs.h"
+#include "ActionHelpers.h"
 
 using namespace Microsoft::WRL;
 using namespace Microsoft::WRL::Wrappers;
 using namespace ABI::AdaptiveNamespace;
 using namespace ABI::Windows::Foundation;
+using namespace ABI::Windows::Foundation::Collections;
+using namespace ABI::Windows::UI::Xaml;
+using namespace ABI::Windows::UI::Xaml::Controls;
+using namespace ABI::Windows::UI::Xaml::Controls::Primitives;
 
 namespace AdaptiveNamespace
 {
@@ -22,15 +27,6 @@ namespace AdaptiveNamespace
     }
     CATCH_RETURN;
 
-    HRESULT AdaptiveActionSetRenderer::Render(_In_ IAdaptiveCardElement* cardElement,
-                                              _In_ IAdaptiveRenderContext* renderContext,
-                                              _In_ IAdaptiveRenderArgs* renderArgs,
-                                              _COM_Outptr_ ABI::Windows::UI::Xaml::IUIElement** result) noexcept try
-    {
-        return XamlBuilder::BuildActionSet(cardElement, renderContext, renderArgs, result);
-    }
-    CATCH_RETURN;
-
     HRESULT AdaptiveActionSetRenderer::FromJson(
         _In_ ABI::Windows::Data::Json::IJsonObject* jsonObject,
         _In_ ABI::AdaptiveNamespace::IAdaptiveElementParserRegistration* elementParserRegistration,
@@ -42,4 +38,31 @@ namespace AdaptiveNamespace
             jsonObject, elementParserRegistration, actionParserRegistration, adaptiveWarnings, element);
     }
     CATCH_RETURN;
+
+    HRESULT AdaptiveActionSetRenderer::Render(_In_ IAdaptiveCardElement* adaptiveCardElement,
+                                              _In_ IAdaptiveRenderContext* renderContext,
+                                              _In_ IAdaptiveRenderArgs* renderArgs,
+                                              _COM_Outptr_ IUIElement** actionSetControl) noexcept try
+    {
+        ComPtr<IAdaptiveHostConfig> hostConfig;
+        RETURN_IF_FAILED(renderContext->get_HostConfig(&hostConfig));
+
+        if (!XamlHelpers::SupportsInteractivity(hostConfig.Get()))
+        {
+            renderContext->AddWarning(
+                ABI::AdaptiveNamespace::WarningStatusCode::InteractivityNotSupported,
+                HStringReference(L"ActionSet was stripped from card because interactivity is not supported").Get());
+            return S_OK;
+        }
+
+        ComPtr<IAdaptiveCardElement> cardElement(adaptiveCardElement);
+        ComPtr<IAdaptiveActionSet> adaptiveActionSet;
+        RETURN_IF_FAILED(cardElement.As(&adaptiveActionSet));
+
+        ComPtr<IVector<IAdaptiveActionElement*>> actions;
+        RETURN_IF_FAILED(adaptiveActionSet->get_Actions(&actions));
+
+        return XamlHelpers::BuildActionSetHelper(nullptr, adaptiveActionSet.Get(), actions.Get(), renderContext, renderArgs, actionSetControl);
+    }
+    CATCH_RETURN;
 }

source/uwp/Renderer/lib/AdaptiveActionSetRenderer.h

@@ -2,8 +2,6 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "AdaptiveCards.Rendering.Uwp.h"
-#include "Enums.h"
 #include "ActionSet.h"
 
 namespace AdaptiveNamespace
@@ -13,9 +11,10 @@ namespace AdaptiveNamespace
                                               ABI::AdaptiveNamespace::IAdaptiveElementRenderer,
                                               ABI::AdaptiveNamespace::IAdaptiveElementParser>
     {
-        InspectableClass(RuntimeClass_AdaptiveCards_Rendering_Uwp_AdaptiveActionSetRenderer, BaseTrust)
+        InspectableClass(RuntimeClass_AdaptiveCards_Rendering_Uwp_AdaptiveActionSetRenderer, BaseTrust);
 
-            public : HRESULT RuntimeClassInitialize() noexcept;
+    public:
+        HRESULT RuntimeClassInitialize() noexcept;
 
         IFACEMETHODIMP Render(_In_ ABI::AdaptiveNamespace::IAdaptiveCardElement* cardElement,
                               _In_ ABI::AdaptiveNamespace::IAdaptiveRenderContext* renderContext,

source/uwp/Renderer/lib/AdaptiveActionsConfig.cpp

@@ -3,7 +3,6 @@
 #include "pch.h"
 #include "AdaptiveActionsConfig.h"
 #include "AdaptiveShowCardActionConfig.h"
-#include "Util.h"
 
 using namespace Microsoft::WRL;
 using namespace ABI::AdaptiveNamespace;

source/uwp/Renderer/lib/AdaptiveActionsConfig.h

@@ -2,10 +2,6 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "AdaptiveCards.Rendering.Uwp.h"
-#include "Enums.h"
-#include "HostConfig.h"
-
 namespace AdaptiveNamespace
 {
     class AdaptiveActionsConfig

source/uwp/Renderer/lib/AdaptiveBackgroundImage.h

@@ -2,10 +2,7 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "AdaptiveCards.Rendering.Uwp.h"
-#include "Enums.h"
 #include "BackgroundImage.h"
-#include <windows.foundation.h>
 
 namespace AdaptiveNamespace
 {

source/uwp/Renderer/lib/AdaptiveCard.h

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "AdaptiveCards.Rendering.Uwp.h"
 #include "SharedAdaptiveCard.h"
 #include "AdaptiveBackgroundImage.h"
 

source/uwp/Renderer/lib/AdaptiveCardConfig.h

@@ -2,10 +2,6 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "AdaptiveCards.Rendering.Uwp.h"
-#include "Enums.h"
-#include "HostConfig.h"
-
 namespace AdaptiveNamespace
 {
     class AdaptiveCardConfig

source/uwp/Renderer/lib/AdaptiveCardElement.h

@@ -2,9 +2,8 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "AdaptiveCards.Rendering.Uwp.h"
 #include "SemanticVersion.h"
-#include "Enums.h"
+#include "BaseElement.h"
 
 namespace AdaptiveNamespace
 {