forked from microsoft/AdaptiveCards
-
Notifications
You must be signed in to change notification settings - Fork 21
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Shared code update Till Jan 2 2024 #408
Merged
ramkrishnajana
merged 1,093 commits into
webex:main
from
mukuagar:shared-code-update-jan-2024
Jan 23, 2024
Merged
Shared code update Till Jan 2 2024 #408
ramkrishnajana
merged 1,093 commits into
webex:main
from
mukuagar:shared-code-update-jan-2024
Jan 23, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Added missing properties in Container Element * Added missing property in ColumnSet Element * Added missing property in Column Element
* Linked curl to QmlVisualizer * Added ImageDownloader class * Changed image download path
* refactor Transform function * Add image urls in a map * Add rehost image logic * Untrack image folder * rehost image sync * Set cache to false for url images Co-authored-by: Ramkrishna Jana <[email protected]>
* Initial Commit * Remove extra spacing at the end of showcard button * Added const keyword to arguments * Added const keyword to arguments * Removed unecessary header files * Added a (const) variable to reduce function calls
…set (webex#137) * Working horizontal alignment * Minor changes
Co-authored-by: Ramkrishna Jana <[email protected]>
* refactored content stack view * column set fixes * added test json * fixed tests * removed usused code * column separator fix * minHeight fixes * fixed tests
* image fix and bleed-fix Signed-off-by: rohshar6 <[email protected]> * bleed-minor-fix Signed-off-by: rohshar6 <[email protected]> * edge cases handled Signed-off-by: rohshar6 <[email protected]> * minor updates for swiftLint * minor change * minor update * minor update
* resource resolver for iconUrl and imageSet * resource resolver fixes * minor refactoring * refactored NSCollectionViewItem
* container background image fixed * repeat horizontally and vertically fixed * changed json
* Working fallback property and elippses in textblock * Removed comments * Added log for UnknownElements
* Updated Date Time Popover * updated file
* bleed background Image and small-images-fix * added url in testUtils * updates made
* Buttons with ellipses working * Submit Action Parity with Windows
* Changed date time format for submit payload * updated files * updated time input
* Time Input renderer placeholder text fix * fix time * review fix Co-authored-by: Ramkrishna Jana <[email protected]>
* Bleed Edge Cases * Height and Width of Bleed Fixed
* padding fix for collection Items * update made
* added renderConfig * fixed tests
* Added curl_multi_perform * Added timeout and wait function * added download_multi_jpeg function * Download all images at once * Call rehost after generateQml * Added for_each loop * removal of comment * Modify lambda * Commented Async download * Added lambda to thread * Added mutex * Commented asynchronous
* column min width fix * fixed trailing newline * rebase fix * increased width
* button-style-fix * minor change * button-styling and dark theme for button added * minor-updates * updates made * dark-theme-button-color fix added
* Initial push * Pushed Escaped Quotes to QmlTag class * Fix indentation
* Added Chevron and Icon (webex#79) * Added Chevron and Icon * Made asked changes * Updated files * Submit action button (webex#76) * rename GenerateButtonId * wire Action.Submit button on clicked logic * Add sample * Added input text and number to the list * Added date input to the list * fix input text * fetch selectTime for 24hr format * fetch selectedTime for 12hr format * fix time * add consolelog * Add input toggle to addToInputElementList * Add combobox choiceset to addToInputElementList * Add radio butotn coiceset to addToInputElementList * Add choiceset selected values to addToInputElementList * rename * indentation * Update source/qml/Library/RendererQml/AdaptiveCardQmlRenderer.cpp indentation fix * fix date renderer to initial * fix date renderer * review fix Co-authored-by: Ramkrishna Jana <[email protected]> * button fixes (webex#82) * Removed line height, fixed monospace font (webex#84) * Action set Renderer (webex#83) * initial push Signed-off-by: rohshar6 <[email protected]> * initial push Signed-off-by: rohshar6 <[email protected]> * adding customLayout Signed-off-by: rohshar6 <[email protected]> * code clean up * refactoring acractionsetview * contaniner renderer test updated and added fakeActionSet Signed-off-by: rohshar6 <[email protected]> * made changes for test Signed-off-by: rohshar6 <[email protected]> * added test cases for actionSet and created mock for submitaction Signed-off-by: rohshar6 <[email protected]> * add minor constraints * minor updates * improved log statement * Add inline action (webex#86) * initial push * fix inline action layout * fix button click function * add const Co-authored-by: Ramkrishna Jana <[email protected]> * Button insets fix (webex#87) * Insets fixed * removed unnecessary print statement * removed unnecessary comments * Color scheme set to momentum * Action.ShowCard Part-1 (webex#88) * width anchor adjust (webex#89) * Dark theme fix (webex#90) * dark theme fix Signed-off-by: rohshar6 <[email protected]> * added minor comments Signed-off-by: rohshar6 <[email protected]> * Fixed wrap & elide property for Toggle Input (webex#92) * Added Action Show Card (webex#81) * Added Action Show Card * Added separator for show card * Updated icons for ShowCard button * Updated the showcard function * ActionSet Renderer (webex#85) * actionset renderer * added default alignment * changed json * merge merge Co-authored-by: rj100189 <[email protected]> * [Mac] Actions wrap inside Action Set (webex#93) * initial Push Signed-off-by: rohshar6 <[email protected]> * added spacing from hostconfig Signed-off-by: rohshar6 <[email protected]> * refactored Utils and added vertical spacing from hostConfig Signed-off-by: rohshar6 <[email protected]> * added test and updated hostconfig util Signed-off-by: rohshar6 <[email protected]> * vertical spacing updated Signed-off-by: rohshar6 <[email protected]> * image resource resolver [mac] (webex#91) * image resource resolver [mac] * refactored resource resolver to support resource key instead of url * updated ImageRenderer test cases * removed comments * renamed FakeImageView to Fake Image * minor refactor * minor change * indentation fix * Date medium format (webex#96) * Added Medium Format for InputDate * Fixed Minimum and Maximum Date * Fixed focus problem * Added signal and slot for calendar * fixed getDate function in utils * Fixed Action Submit for InputDate * Minor fixes * Change signal name * Show card action (webex#94) * show card action fix * flatbutton clean ups * clean ups * theme fix * added tests * Showcard part 2 (webex#95) * fix sample json * fix loader id * add separate list for show card * Add sample card and rearrange the layout logic * add comment * add only one separator before loader * add if ocndition to the component * Add show card wizard sample * modify submit action element list * fix sample * remove hardcoded background color Co-authored-by: Ramkrishna Jana <[email protected]> * added tests (webex#102) * [Mac] Action Style for Action Button (webex#99) * acr-button styling added Signed-off-by: rohshar6 <[email protected]> * minor refactoring Signed-off-by: rohshar6 <[email protected]> * updated flat button Signed-off-by: rohshar6 <[email protected]> * added constants strutc Signed-off-by: rohshar6 <[email protected]> * added none case for dark theme button Signed-off-by: rohshar6 <[email protected]> * minor change Signed-off-by: rohshar6 <[email protected]> * chevron color updated Signed-off-by: rohshar6 <[email protected]> * Width and Height (webex#98) * Initial Push * Height and Vertical Alignment Fixed * conflicts Resolved * Update source/qml/Library/RendererQml/AdaptiveCardQmlRenderer.cpp Co-authored-by: rj100189 <[email protected]> * Seperator property Added * Variable Names changed * Update source/shared/cpp/ObjectModel/CollectionTypeElement.cpp revert * Seperator Function removed Co-authored-by: rj100189 <[email protected]> * Action toggle visibility (webex#103) * Added action - Toggle Visibility * Added FactSet ID property * Toggle Visibility fix for Multiline Text Input Block * Added toggle visibility wizard card * "Background Image View Added with Test Cases" (webex#97) * "Background Image View Added with Test Cases" * Conflict Resolved * Changes Made * Removed change to Column View * variable 'bgimage' changed to 'image * image variable made optional * [MacOS] Image width fix (webex#106) * image width fix * added some checks * Replaced \n with <br/> (webex#107) * Action submit branch (webex#101) * Basic funcunality working * Submit action working for choiceset * Cleaned up a bit * Fixed seperator spacing multiselect choiceset * Added tests and fixed small issue with multiselect choiceset * Added data from action.submit * Added Minor changes * Refactored According to comments * Added test for dataJson * Background Image (webex#104) * background image * changed frame * changes to frame * Add markdown (webex#108) * select action property (webex#100) * Wire select action mouse area * set adaptiveCardRectangle color to transparent * set hover color to emphasis * Card select action json * Add select action for image renderer * add text run select action * add click function to mouse area * add sample cards * fix select action submit click * textrun jason * fix onLinkActivated * Add background rectangle to GetNewContainer * Add select action to column and container * ContainersSubmitSelectActionList * select action on columns set renderer * add rectId parm to SelectAction() * refactor textRun select action * realign and rename * refactor container and column select action * refactor column set select action * remove unneccessary code * make ImageRender parent rectangle transparent * indentation * add log * review fix Co-authored-by: Ramkrishna Jana <[email protected]> * [Mac] Inline action function (webex#105) * added inline-action functionality for openUrl * minor update * updated contentInsets for inline-action * added inline submit action * added minor comments * updated code after review * Background Image Wiring Done (webex#109) * Background Image Wiring Done Redeclaration in OpenURLTest Fixed * Required Changes Made * [Mac] Added fix for fake elements for test cases (webex#110) * added fix for fake renderers * minor-update * [MacOS] Column Inherited Properties (webex#111) * properties fix * fixed tests * Date and time pop-over updation (webex#112) * Date and time pop-over updation * feedback changes * Bug fixes (webex#113) * Added color change to showcard icon on hover * Enabled mouse selection for input fields * Fixed showcard button's icon color * Placeholder Fix for Input Date and Input Time (webex#114) * Fixed Placeholder for Input Date and Input Time * InputDateTimePlaceholder * Made the '===' consistent * review fix * Review fixes * Textblock bugs (webex#119) * Date Time Parsing added * Escaping quotes in text * Container, Column, columnSet, AdaptiveCard select action (webex#118) * Basic container with OpenURL working * commit before pulling action.submit * Working column, columnset, card and container selectaction * Refactored code a bit * Minor changes according to comments * [SPARK-221254] - Color of Column in Select Action after Hovering (webex#120) * Refactoring Done and Constants Removed (webex#117) * Refactoring Done and Constants Removed * Made required changes * Further Changes Made * [MacOS] BackgroundImage and BackgroundColor fix (webex#124) * added json and bridge fix * resolver refactor * render param refactor * added tests * fixed column bgimage * Input number (webex#122) * input number modified * converted text to number * valueFromText function * made suggested changes * modified valueFromText * SelectAction for TextRun and Images (webex#121) * Text run working * minor changes * Made changes according to commit * Minor change * [MacOS] SubmitAction fix for Nested Show Card setup (webex#123) * added recursive logic to fetch input handlers from the parent card for submit action * added tests for submit action for child show cards * [MacOS]Added scroller to the card view (webex#125) * Added scroller to the card view * removed horizontal scroll * Escape sequences For TextBlock and RichTextBlock (webex#126) * Added function in Utils * Handled escape sequence for Richtext as well * minor changes * spacing code * image renderer properties [mac] (webex#116) * initial commit for image rendering fixes * added sample file * added test cases * image constraints fixes inside stretch columns * Update source/macos/AdaptiveCards/AdaptiveCards/Views/ACRContentHoldingView.swift Co-authored-by: blue-stone99 <[email protected]> * removed test cases for the visibility changes * Delete File 2 Co-authored-by: blue-stone99 <[email protected]> * Working horizontal alignment (webex#129) * [MacOS] FactSet Alignment fix (webex#127) * Draft Commit with fix * Made variables more sensible * More sensible variables * Made Necessary Changes * Made More required changes * Minor Change * More changes as needed * [MacOS] Bleed property added to Collection Type Elements (webex#128) * initial push * minor-update * bleed json added * added fix for constraints * test-code Signed-off-by: rohshar6 <[email protected]> * test-code removed logs Signed-off-by: rohshar6 <[email protected]> * bleed added to columset and container * column bleed items complete * adding minor comments * minor change * minor refactoring * updates made * column view update * added bleedUtils * xib bg color fix (webex#131) * factset fix (webex#132) * Bleed Fix for container and columnset (webex#115) * Initial Push * Variables removed * Height fix * Horizontal Bleed Fixed * Vertical Bleed Done * Vertical Bleed Fixed * Card Added * image width fixed (webex#130) * Minor updates (webex#133) * Added missing properties in Container Element * Added missing property in ColumnSet Element * Added missing property in Column Element * Curl setup for Image (webex#134) * Linked curl to QmlVisualizer * Added ImageDownloader class * Changed image download path * Async Image re-hosting (webex#138) * refactor Transform function * Add image urls in a map * Add rehost image logic * Untrack image folder * rehost image sync * Set cache to false for url images Co-authored-by: Ramkrishna Jana <[email protected]> * Fix fetchDateTime for Linux (webex#140) * Showcard bugs (webex#135) * Initial Commit * Remove extra spacing at the end of showcard button * Added const keyword to arguments * Added const keyword to arguments * Removed unecessary header files * Added a (const) variable to reduce function calls * Fixed error for localtime_r (webex#141) * [MacOS]Working horizontal alignment and hover for selectAction Columnset (webex#137) * Working horizontal alignment * Minor changes * fix std::optional<int> (webex#143) Co-authored-by: Ramkrishna Jana <[email protected]> * [MacOS] ColumnSet Height wrapping fixes (webex#136) * refactored content stack view * column set fixes * added test json * fixed tests * removed usused code * column separator fix * minHeight fixes * fixed tests * [MacOS] Bleed Fix and Image Fix (webex#144) * image fix and bleed-fix Signed-off-by: rohshar6 <[email protected]> * bleed-minor-fix Signed-off-by: rohshar6 <[email protected]> * edge cases handled Signed-off-by: rohshar6 <[email protected]> * minor updates for swiftLint * minor change * minor update * minor update * [MacOS] resource resolver for iconUrl and imageSet (webex#139) * resource resolver for iconUrl and imageSet * resource resolver fixes * minor refactoring * refactored NSCollectionViewItem * enabling resource resolver (webex#147) * Background Image fillmode property fix (webex#142) * container background image fixed * repeat horizontally and vertically fixed * changed json * [MacOS]Added Fallback (webex#145) * Working fallback property and elippses in textblock * Removed comments * Added log for UnknownElements * [MacOS]Updated Date Time Popover (webex#146) * Updated Date Time Popover * updated file * created masksource tag (webex#148) * [MacOS] Bleed in Background Image Fix and Image Size Fix (webex#149) * bleed background Image and small-images-fix * added url in testUtils * updates made * [MacOS]Minor fixes for buttons and Submit Action (webex#151) * Buttons with ellipses working * Submit Action Parity with Windows * [MacOS]Changed date time format for submit payload (webex#150) * Changed date time format for submit payload * updated files * updated time input * minor fix for images with explicit dimensions (webex#152) * Time Input renderer placeholder text fix (webex#153) * Time Input renderer placeholder text fix * fix time * review fix Co-authored-by: Ramkrishna Jana <[email protected]> * Bleed Width and Height (webex#154) * Bleed Edge Cases * Height and Width of Bleed Fixed * Some minor attribute fixes to textblock (webex#156) * [MacOS]Padding fix for collection Items (webex#155) * padding fix for collection Items * update made * ImageSet Working Inside Columns (webex#158) * [MacOS] Added RenderConfig to maintain flags (webex#159) * added renderConfig * fixed tests * Downloading Images Asynchronously (Part 1) (webex#157) * Added curl_multi_perform * Added timeout and wait function * added download_multi_jpeg function * Download all images at once * Call rehost after generateQml * Added for_each loop * removal of comment * Modify lambda * Commented Async download * Added lambda to thread * Added mutex * Commented asynchronous * [MacOS] Column width edge case fixes (webex#161) * column min width fix * fixed trailing newline * rebase fix * increased width * [MacOS]Button Style Fix (webex#162) * button-style-fix * minor change * button-styling and dark theme for button added * minor-updates * updates made * dark-theme-button-color fix added * Clean Escaped Quotes (webex#165) * Initial push * Pushed Escaped Quotes to QmlTag class * Fix indentation * Method name change (webex#168) * [MacOS] Added flag to prevent 1.3 properties from rendering (webex#163) * 1.3 property check * Removed conflicts * Minor refactoring * [MacOS]Collection Items fix and Bleed update (webex#167) * column fix and bleed update * minor-update * minor-update * update made * [MacOS] fix for extra padding in images in columnset (webex#160) * fix for extra padding in images in columnist * changes for column height anchor * refactored ACRContentHolding view to ACRImageWrappingView * added test cases * minor changes * [MacOS] Input number fix (webex#164) * InputNumberFixed * minor refactor * Minor Bugs Fixed and Test Cases Added * Small change * [MacOS]Min-height fix for ColumnSet (webex#169) * fix added and test cases updated * added json for min-height Signed-off-by: rohshar6 <[email protected]> * minor-update * minor-test-case improved * minor-update * [MacOS] Project clean up (webex#170) * deleted unused files and some abs path * removed absolute paths * dead code fixes * Clean comments (webex#172) * Cleaned Comments * minor change * Resize bug fix (webex#173) * Initial Push * Binding Loop Removed * Resize Property Added * Fix overlay error (webex#175) * initial push * TIme input fix * fix show card button * fix input number error Co-authored-by: Ramkrishna Jana <[email protected]> * Unit Tests (webex#174) * Initial Push * Refactored * QML Files Updated * Image Render Uncommented * Fixed SCF code (webex#176) Co-authored-by: Kishore Ponmuthuramalingam <[email protected]> * added show card callback (webex#179) * TextBlockCrash (webex#180) * Fix Input Date Bug (webex#178) * Graphicsfix (webex#181) * Remove glow tag * remove color overlay * remove OpacityMask * Add card border color * remove color overlay Co-authored-by: Ramkrishna Jana <[email protected]> * Graphicsfix (webex#181) * Remove glow tag * remove color overlay * remove OpacityMask * Add card border color * remove color overlay Co-authored-by: Ramkrishna Jana <[email protected]> * Graphicsfix (webex#181) * Remove glow tag * remove color overlay * remove OpacityMask * Add card border color * remove color overlay Co-authored-by: Ramkrishna Jana <[email protected]> * Graphicsfix (webex#181) * Remove glow tag * remove color overlay * remove OpacityMask * Add card border color * remove color overlay Co-authored-by: Ramkrishna Jana <[email protected]> * Graphicsfix (webex#181) * Remove glow tag * remove color overlay * remove OpacityMask * Add card border color * remove color overlay Co-authored-by: Ramkrishna Jana <[email protected]> * Handled the Invalid Qml Ids (webex#182) * Handled the invalid qml ids * Remove dead code * Fix Icon Color for Input ChoiceSet, Date and Time (webex#183) * Fix icon color for Date,Time,Choiceset * Changed Icons * Removed dead code * Added IconTag() function * [MacOS] Invalid JSON exception fixed (webex#184) * invalid json fix * fixed tests * Fixed invalid month (webex#185) * [MacOS]Hyperlink text working with renderconfig (webex#186) * Hypertext link working * Fixed in factset too * Index=ntation fix * [MacOS]Text properties directly added to attributed String (webex#187) * Text properties directly added to attributed String * Minor change * added layout and text callbacks (webex#188) * [MacOS]Added clear button in date and time (webex#189) * Added clear button in date and time * Fixed test cases * Added new tests and cleaned ACRDateField * Fixed multiple selection issue (webex#190) * Fixed multiple selection issue * Minor change * [SPARK-239984] Enable Hyperlink in texts for native Adaptive Cards(Windows) (webex#191) * Changed hyperlink color * connected link to openUrl * Formatted changes * Moved Markdown function to Utils * add static * Fixed links for RichTextBlock * [SPARK-241909] Border Color and Icon changes based on UX (Windows) (webex#192) * Changed border colors * Fixed choiceSet and showcard icon alignment * Reduced childCard margin * Changed Number Input Icons to momentum * Fixed icon coloring for action showcard * Fixed ShowCard icon coloring * ShowCard bottom margin * fixed showCard bottomMargin for collection elements * showCard margin fix * minor fixes * removed dead code * Minor changes * Removed redundant property * minor change * Bottom border for showCard * Suggestion changes * [MacOS]Bug fixes in accordance with webex (webex#193) * Changes to maintain parity with webex version * Minor change * [SPARK-242277] Redesgin Dropdown Menu in InputChoiceSet (Windows) (webex#194) * Redesigned Dropdown choiceSet * Removed hover to match html * Added height for combobox * Fixed padding * Upstream fetch * Fixed font family * [SPARK-237834] Popup fix for Input Date and Time (Windows) (webex#195) * Fixed date input popup * Fixed Input Time Popup * indentation * removed dead code * minor changes * comment * minor fixes * [SPARK-244835] Bug Fix for Input ChoiceSet (Windows) (webex#196) * Quotes in choiceSet model * Minor change * sync update (webex#197) * [SPARK-201241] Clear Button for Input Date and Input Time (Windows) (webex#198) * Added clear button to input Date * Clear Button for input Time * Refactor * Fix icon placement * Align icons * Refactor row element * Minor Changes * Added changes to maintain parity with webex (webex#200) * [MacOS] ShowCard hides ImageSet fix (webex#199) * cleaned acrcollectionview * removed colldatasource * added tests * [MacOS] ShowCard inside ActionSet update (webex#201) * cleaned callbacks * action set clean up * re-wired with actionsetview as target handler * showcard functional inside actionset * added tests * sync changes * [MacOS] Icon Position aligned with HostConfig values (webex#202) * icon position fix * added tests * [MacOS] Minor bug fixes and clean ups (webex#203) * bug fixes and code cleanup * updated tests * [MacOS] Toggle visibility support added (webex#204) * added toggle visibility support * added tests * removed ishidden validation (webex#205) * [MacOS] Newline Support & Column isVisible update (webex#206) * newline support * added base properties for columns * [MacOS] Working custom text field (webex#208) * Working custom text field * Minor change in titlerect * Added test and fixed clear button * Minor changes * Final few changes * [MacOS] Working UI for ChoiceSet made according to figma (webex#207) * Working UI for ChoiceSet made according to figma * tasks.json deleted * Comments resolved * fixes made * Tests Implemented * Tests Fixed * Revert "tasks.json deleted" This reverts commit e6ffbe8. * tasks.json fix * MacOSVisualizer.pbxproj fix * Merge Conflicts Resolved * [MacOS] Added custom date-time fields (webex#209) * Added custom date-time fields * Resolved conflicts * Resolved comments * Default config now works with date time field too * resolved comments * [Mac OS] Multiline text view rebrand (webex#210) * MultilineInput Matched with SingleLine Text input * Tests Implemented & UCF's minor changes synced * Minor Fix * InputFieldConfig defaults matched with old UI * Comments resolved * Placeholder Padding Issue Fixed * Tests fixed * Minor refactor * [Mac OS] Radio Button Bugs Fix, FactSet Bugs Fix (webex#211) * Radio Button Bug, Hyperlink Text Color Fix * Fixed backgroundColor for FactSet * FactSet Title now has markdown working * Change to remove conflicts with InputNumber PR * Comments Resolved * Removed Dead Files * Resolved More Comments * Button Click Fix (webex#213) * [MacOS]Working input number rendered (webex#212) * Working input number rendered * Tests added * Fixed stepper function * Resolved comments * Minor changes added * Removed setupTheme function * Fixed insertionPoint color bug * [MacOS] Small bugs in MultilineInputView, and dark theme default background colors fixed (webex#214) * Small Bugs Fixed * Tests fixed according to fixes * Fixed Parity with UCF * small documentation change * Changed button colors (webex#217) * Changed button colors * Fixed inline buttons, fix colorutils, added colorutils tests * Removed comment * [SPARK-237839] Calendar for Date Input (Windows) (webex#215) * Calendar * connected signal between calendar and textfield * Added theming * Added minimum and maximum date * Removed dead code * Comment * Remove comment * onCLicked Bug fix * hover color * Minor change * [Win] Cards accessibility (webex#216) * Initial Accessibility * Removed dead code * Colors changed * Removed Dead code * Refactoring done * Refactoring done * Spaces Removed * Spaces Removed * Refactored * Input Number Fixed * [SPARK-270116] Add RenderConfig for Input Elements (Windows) (webex#218) * Added renderConfig * add RenderConfig class to visualizer * Added InputFieldClass * Minor Changes * Changed name to AdaptiveCardRenderConfig * suggested changes * Added RenderConfig cpp * minor changes * remove hardcoded theme * Suggested chnages * Fixed text alignment issue and changed color scheme to argb from rgba (webex#219) * [MacOS] Input fields UI fixed (webex#221) * Input fields fixed to rebrand figma * Resolved comments * Tests Fixed * Parity fix * [MacOS] Date Field Default Date Fix (webex#220) * Working date field current date and button limit extended * Added tests and fixed action alignment * Minor comment added * Resolved comments regarding switch case and tests * resolved nits * [MacOS]Fixed Multiline input height (webex#225) * Fixed Multiline input height * Minor change * [Win] Buttons and Cards UI Refresh (webex#223) * Initial Ui Refresh Changes * Colors updated * Host Config updated and Minor Changes * Minor Changes * Placeholders Fixed in input fields (webex#222) * Placeholders Fixed * Comments resolved * Minor lint changes * More minor lint changes * [MAC OS] Multiline Input View Top padding added (webex#226) * Initial Commit (With updated tests) * Minor regression identified * Minor fixes, cleaned up code * More minor Fixes * Cleaner implementation * tests fixed * [Win] Buttons and Cards Bug Fixes (webex#227) * Initial Changes * Main Card Radius Changed * Show Card Image Fixed * Code synchronized with UCF * Minor Changes * Dead Code Removed * [MAC OS] Buttons UI Fixed, Date/TimeField icon size and field width Fixed (webex#224) * Initial commit, buttons fixed * Custom Chevron Images support added * Cleaned up Code * More ironed-up code * Tests added * Comments resolved * Fixed bugs (webex#228) * [SPARK-277643,277299] Bug Fixes for Buttons and Cards (Windows) (webex#229) * Fixed bugs * Remove dead code * [SPARK-278935] Fix TextBlock Markdown (Windows) (webex#230) * Fix hyperlinks * minor changes * revert escape sequences * Formatting changes * [Win]Buttons and Cards UI Rebrand Bug Fixes (webex#231) * Action Inline Fixed * Initial Changes * Removed unnecessary code * Checkbox fixed * Opacity Mask Removed * Minor changes * Minor Changes * ClipRectangle Modified * [SPARK-267453] Added Disable State for Submit Button (Windows) (webex#232) * Added disabled state * Changed timer * [Win] Accessibility for Screen Reader and Keyboard (webex#233) * Date Input Finished * Input elements accessibility added * Focus Rectangle Added * [Macos]Accessibility Changes (webex#234) * Accessibility Changes * Add tests * Cards accessibility (webex#235) * Initial Changes * Show Card Connected * Minor Changes * Minor Changes * Minor Changes * Names changed * Card Accessiility Modified * Final Changes * Minor Changes * Combobox visibility fixed * SPARK-275613 : Crash when using fallback (webex#236) * Card Height Changes (webex#238) * [MACOS] Accessibility Fixes in Cards (webex#237) * Initial Commit * Cleaner implementation * [Win]Stretch Input Elements Height Fix (webex#242) * Initial Changes * Minor Changes * Fix for SPARK-289079 & SPARK-227200. (webex#239) * [MacOS]Add Support for Associated Inputs in Action.submit (webex#240) * Working Associated Inputs with Tests * Reworked submit logic * [MacOS] Working ErrorMessage Delegates (webex#241) * Draft changes * Working ErrorMessage Delegate with tests * Removed extra line * Resolved conflicts * Change protocol definition * Minor change * [Win] Image Person Style (webex#245) * Person Style Changes * Fact set width corrected * Input Text Renderer for 1.3 (webex#244) * Initial Commit for code refactor * Removed 3rd Level of refactoring for now * Added Associated Inputs * Added Stretch Property * Input Field Colors for Error Validation added * Error Message Colors Added * Code Refactor * Accessibility Added * Incorporated Review comments * Review comments Co-authored-by: Govardhan N <[email protected]> * [Mac] Input validation updates for TextFields (webex#248) * updated error ui * added tests * renamed error dele and updated refocus logic * fixed tests and renamed errorstate struct * [Win] Choice Set and Input Toggle 1.3 Features (webex#247) * Initial Changes * Added Accessibilitty For Toggle Input * [MacOS]Input Validation in choiceset and toggle (webex#246) * Input Validation in choiceset and toggle * minor space added * Fixed compact choiceset with empty values * Refactored logic * Resolved comments * Refactored to add validation logic in contentstackview * Minor changes * Feature 1 3 number (webex#250) * Pushing Before Re-factoring * Refactoring * changed tab to 4 space * Fixed issue related to label * Code Cleanup * Added accesibility and Fixed some minor issues * Refactoring wrt to ID's * Fixed issue * add missing file * Reverting project setting change * Fixed border color issue's * Fixed Review comments by Govardhan * Removing Validaion in case isRequired is not set. * Fixed Issue reated to isRequired * Fixed issue related to input validation when is required is not supplied. * [Win] - Input Date and Time 1.3 (webex#249) * 1.3 added to Date Input * Time Input Refactored * Refocus added * Removed Dead code * Dead code removed * Min and Max values fixed * Number JSON added * SPARK-297239 : Unit Test Issues for Input Number and Input Text (webex#252) * SPARK-297239 : Unit Test Issues for Input Number and Input Text * Fixed Review comment * [MacOS] Accessibility improvements for 1.3 elements (webex#251) * Working screen reader with 1.3 for choiceset/toggle * changed to convenience initialisers * Initial Changes (webex#254) * [MAC] - Bug fix for number input not clearing error on keyboard accessibility on stepper (webex#253) * [MAC] - ScreenReader support on submit of cards with error message (webex#255) * Initial Commit * Fixed minor things * added localised string * Comments resolved * Minor bugs identified and fixed * [MAC] - Voiceover support for 1.3 schema in textfield and related inputs (webex#256) * Initial Commit * Resolved Comments * [MAC] - Accessibility Fixes for Multiline Input, and other minor improvements (webex#258) * Parity Fixes * Multiple small bugs fixed * tests fixed * Comments resolved * MultilineInputtextView Test and View fixed * [Win]1.3 Minor Bug fixes (webex#257) * Minor Bug Fixes * Minor Changes * Graduation test fixed * [Win] : Escape Sequence in PlaceHolders (webex#259) * Escape Sequences Allowed in Placeholders * Minor Changes * Minor Changes * Added variables to necessary places * Initial Changes (webex#261) * [Win] Text Select Added to Adaptive Cards (webex#260) * Text Select Context menu selected changes * Added Context Menu * [Win] Markdown Support in Choice Set Expanded Style and Input Toggle (webex#262) * Intial Changes * Minor Changes * Comments Resolved * Action Toggle Color Fix (webex#263) * added tests and fix (webex#264) * [Win] Buttons and Cards Center Alignment in Action Set (webex#266) * Initial Changes * Minor Changes * Spark 306189 :: Input.ChoiceSet with markdown URL set in choice "title" appears as raw text. (webex#265) * commit: Input.ChoiceSet & InputToggle with markdown * commit: change leading constant - Input.ChoiceSet & InputToggle with markdown * commit: change attribute string - InputToggle * commit: minor changes * commit: 306189 :: fix text font, add testcases, * commit: separate ACRHyperLinkTextView, comman textproperties converter * make universal attributedString render function * commit: Fix:: 241471 markdown with bold and italics (webex#267) * commit: Fix:: 241471 markdown with bold and italics Textblock weights do not work with markdown bold and italics * commit: Fix multi traits edge case. for bolder italic. for monospace. * Fix columns min height property (webex#268) * Fix columns min height property * add stretchMinHeight Co-authored-by: ramjana <[email protected]> * style property of image not working inside imageset (webex#270) * style property of image not working inside imageset * test cases * toggle visibility - column overlap render issue (webex#271) * toggle visibility - column overlap render issue * scenario updated when 1st view is hidden and extra space left in front of 2nd view * test case * Toggle from child card to parent card (webex#275) * refactor code - using guard let * toggle from child card to parent card * test case * failure case handled * Refactor ImageView constraint (webex#274) * Refactor ImageView constraint Remove the existing imageview setup constraints logic. take help from Microsoft iOS AdaptiveCard imageview class. * update content size in imageprops * Ace bot button click fixed (webex#269) * 1. removed redundant styling , 2. added flow for tabbing indent case (webex#276) * 1. removed redundant styling , 2. added flow for tabbing indent case * updating paragraphstyle if it has not been updated * Adding Static Qml for Visualizer (webex#280) * Initial Changes * Moved Static files to different folder * Utils flies moved inside Qml Folder * Initial Text Show in Multiline (webex#283) * setting all column with equal width if any one has width property as auto (webex#281) * setting all column with equal width if any one has width property as auto * review comments * var to let * added changes for style padding * Image's Height and Accessibility (webex#284) * Image Render Bug Fix * Added accessibility to Image * Card Crash for MultiLine Text Edit 1.3 (webex#285) * Binding Loop Fixed * Card Crash Fixed * Stretch Removed in Image * Combobox Initial Value fixed (webex#288) * [Win] Card toggle visibility (webex#286) * Initial Changes * Toggle Input Issue Fixed * Toggle Visibiliy Added to Image Render * Toggle Visibility added to Rich Text Block * Removed Unnecessary Chages * tooltip corrected * Accessibility Fixes * Test case corrected * Fixed: [Mac] TextBlock which contains a numbered list does not indent properly if the text is long (webex#289) minor changes * Show Card Compiling Delayed and Height Estimate (webex#291) * Show Card Lazy Rendering Added * Height Estimate Changes * Structs Added * Comments resolved * Comments Resolved * Input ChoiceSet Overflow Fixed (webex#296) * ChoiceSet Overflow fixed * Constant Added * Support height main Branch Merge to Main (webex#300) * Height Property: ACSFillerSpaceManager Integration (webex#278) This changes is part of Introducing Height Property. This manager helps for stretchable view handling. Add test case for ACSFillerSpaceManager * Height Property: Container, Textblock (webex#279) * Height Property: Container, Textblock Support Height property at container view Support Height property at TextBlock (we need some element which we can check with container) Introduce new ACRContainerView Class Remove Cycle Hierarchy from Main card render Remove Cycle Hierarchy from Container render Introduce intrinsicContentSize layout Add Height test cases for Container, TextBlock * minor changes in BaseCardElementRenderer * minor changes at FillerSpaceManager * minor space changes * Support height property ColumnSet Column RichTextBlock (webex#282) * Support height property ColumnSet Column RichTextBlock Support height property at ColumnSet New ColumnSet class Remove cycle hierarchy from ColumnSet Introduce intrinsic content size layout ColumnSet Change separator design Refactoring and support height property at ColumnView Remove cycle hierarchy from Column Renderer Support Height property at RichTextBlock Test case * Separator and minor changes * Support Height at ActionSet, FactSet, Inputs(Number, Date, Time) (webex#287) * Support Height at ActionSet, FactSet, Inputs(Number, Date, Time) Changes and refactor at FactSet, ActionSet and Inputs Number, Date, Time Remove cycle hierarchy layer Add Test case * minor changes - camelCase name, remove nil scenario * minor changes * Update:: Introduce Visibility Manager to handle spacing/separator views (webex#290) * Update:: Introduce Visibility Manager to handle spacing/separator views * minor changes updates * minor changes and comment * commit minor changes * Update : Support Height InputText(singleline), choiceset, inputtoggle (webex#292) * Update : Support Height InputText(singleline), choiceset, inputtoggle Refactor inputText view, input toggle, choiceset support height add test for height * make separate files * minor changes * update:: support height Input Multiline text (webex#293) refactor ACRMultilineTextView * Fix multiple error and label message for 1.3 (webex#295) * fix error label * add test case * minor changes * minor changes * minor changes at initialisation * minor changes * width auto elements not rendering properly (webex#294) * width auto elements not rendering properly * checking for multiple cases for width * adding padding space based on element spacing * Fix :: Error & Label Hide issue Padding view issue (webex#297) * Fix :: Error & Label Hide issue Padding view issue * add test case * Fix : Memory Allocation fixes (webex#298) * Fix : Memory Allocation fixes * minor comment changes [remove log, minor changes] * minor comment changes * Fix: charity bot image issue (webex#299) * Fix: charity bot image issue update imagerenderer update test case for visibility context add json file * Update identifier Co-authored-by: sidkotha <[email protected]> * Action Render Crash Fixed (webex#301) * extended dislay issue (webex#302) * Add retry to exit loop (webex#303) Co-authored-by: ramjana <[email protected]> * change to unsigned int (webex#304) Co-authored-by: ramjana <[email protected]> * Fixed: ACSFillerManager.getSeparator crash (webex#305) change is SpacingView.renderSpacer return nil when separator == None add not nil separator scenario at associateSeparatorWithOwner method Remove nonretainObject strong reference to weak reference NSView handle nil scenario Minor changes * Fixed: ActionSet Horizontal alignment issue (webex#306) Fix horizontal alignment issue with sub stackview. Refactor naming convention. minor changes * Regex Match Fixed (webex#307) * Adding Card Constants (webex#308) * Initial Changes * ThemeUtils Added * Errors Corrected * Themes Corrected * Stretchable View not working properly at first time after Action.Toggle (webex#310) * Added changes * Added tests * Modified older tests due to last spacing view * Resolved comments * Renamed functions * Image set action submit (webex#311) * ImageSet - using ACRImageWrappingView instead of ImageSetImageView * imageSet imageSize and image size property change * giving priority to imageSet imageSize * removed redundant code and updated a failing test * updated method name * Initial changes (webex#309) * Initial changes * Fix during unit testing * Fixed Review Comments by govardhan * Fixed issue related to selecltion color * Fixed QML Formatting issue * Comments Removed * Comments Resolved Co-authored-by: Govardhan N <[email protected]> * [MAcOS]Fix bugs related to height properties (webex#312) * Added changes for bugs * Added tests * Updated acc to comments * commit: Add CollectionView FlowLayout (webex#313) * commit: Collection View Flow Layout Fixes: - Add new FlowLayout Class - Adaptive CollectionView item size with explicitly Height, Width and default sizing. - Customised Vertical item position - Customised Horizontal Item Position - padding added from hostConfig - add minimumInteritemSpacingForSectionAt, minimumLineSpacingForSectionAt * update ACSCollectionViewAlignLayout comment changes * commit: Add test json, minor changes * minor changes * Choice Set to Static QML (webex#314) * Initial ChoiceSet Changes * Action Submit Handled * Added Accessibility * Removed Unnecessary Code * Formatting Done * Minor Bugs Fixed * Binding Loop Fixed * Aspect Fit in imageset item view (webex#315) - change card size - add item in testutils - fix Aspect fit issue * Fixed width property in content stack view (webex#316) * Fixed width property in content stack view * Minor refactor * Binding Loop Fix (webex#318) * card Static functions (webex#317) * Add new protocol at ImageResourceHandlerView for Image setup (webex#319) * Mac B&C: Add ImageSet Unit Test (webex#320) * Added tests * Removed extra line * ImageSet : Add ACSHeightType Support (webex#322) - Add Height support - Unit test - Remove Height support elements bool - Update BaseCardElement Renderer * Added tooltip for choiceset (webex#323) * Added changes * Added tests * Initial changes related to Action button (webex#321) * Initial changes related to Action button * Fixed actions submit open show url is still pending * Done changes related to action set * Fixed issue related to actions * Fixed Show Card * Toggle Visibility Element Fixed * Fixed Bugs * Code cleanuo * Formatted QML Files * Adding placeholder Loader * parity PR for UCF Ut Fix * Code refactoring * Fixed Review comments * Fixed Review comments * Fixed QML Format Co-authored-by: Govardhan N <[email protected]> * Number Input Render Changes (webex#325) * Number Input Render Changes * ID's Updated * Tooltip added to ChoiceSet * Removed Unnecessary Changed * Spark 364328 (webex#324) * changes related to TextInput Element * Changes related to Input Text along with inline actions * Fixed issue related to strech height * created seperate function for actions * Fixed Regex related issue * Minor Fixes * Fixed review comments * Minor Bug Fixes * Fix from UCF * Formatted QML Files * Revert "Formatted QML Files" This reverts commit 6b53eac. * Revert "Fix from UCF" This reverts commit 63e971f. * Merge Fix from UCF * Formatted Qml Files * Fix Issue found during BTPexecution * fix center align issue with stack element (webex#327) * Date Input Render (webex#326) * Date Input Initial Changes * Popout Initial Changes * Popout Added * Date Input Popout Complete * Integrate Popup and Text Field * Accessibility in Popout Fixed * Minor Issues Fixed * Label Render Fix (webex#329) * Input Action Submit Fix (webex#330) * Label Render Fix * Action Submit Fixed * Time Input Render (webex#328) * Tasks JSON removed * Util File Reverted * fix Column stretch, add support vertical content alignment (webex#331) * fix: Column stretch, vertical content alignment fix : - ColumnSet height is stretch - Internal element height does not stretch in center/bottom vertical alignment - test case * commit: comments * Added changes (webex#333) * Fix: ActionSet height gets ambigus with stretch containers (webex#332) update container file update and add unit test * Auto generated enums (webex#337) * added struct codegen (webex#341) * Added classes changes (webex#349) * Integrate codegen with acl (webex#353) * running build * minor change * minor change * Parity changes to ucf (webex#365) * Parity changes to ucf * pbxproj changes * Shared code update from windows (webex#375) * Action.Submit Associate Input FIx (webex#336) * Associated Input Fix * Time Picker Accessibility Fixed * SPARK-405507 : [Windows]Submit value if not coming correct in case where data is simple string or Number (webex#338) * Input text visual focus (webex#340) * Input Text Visual Focus * Added WCustomFocusItem * Removed Unnecessary Changes * Remove Unnecessary Changes * Associate Input Elements Fix (webex#342) * SPARK-407820 (webex#345) * Visual Focus for Number Input (webex#344) * Number Input Focus * Validation added for Min and Max * Focus State Corrected * Removing anchors to make item generic * Focus Ring Added for Date Input (webex#347) * Focus Item Added * Spaing added to avoid overlap * Min and Max Date corrected in Popout * Selected Date Corrected * Changes for UT * Accessible Text Added * dateInputPopout refactored * Synced With UCF * Focus Ring For Time Input (webex#352) * Focus Ring Added * Accessible Text Added * Focus Rings For Choice Set and Input Toggle (webex#355) * Focus RIng Added for Choice Set and Toggle * Added Focus Rings to ChoiceSet Popout * ChoiceSet Popout Open Issue Fixed * Bugs Fixed (webex#357) * Added Focus Rings to select action (webex#359) * Center align action set (webex#362) * Center Align in Action Set Fixed * Unnecessary Changes removed * Focus Ring for Cards (webex#366) * Shared Code update from windows --------- Co-authored-by: ankmangl <[email protected]> * (mac) Fix Input Number Max size issue (webex#378) * Added changes * Added tests * Updated tests acc to comments * [mac]Fix crash in updated shared code in choice set (webex#379) * Fixed crash * Updated tests according to comments --------- Signed-off-by: rohshar6 <[email protected]> Co-authored-by: snbehar <[email protected]> Co-authored-by: rj100189 <[email protected]> Co-authored-by: Ramkrishna Jana <[email protected]> Co-authored-by: blue-stone99 <[email protected]> Co-authored-by: dgharde <[email protected]> Co-authored-by: Rohit Sharma <[email protected]> Co-authored-by: riag23 <[email protected]> Co-authored-by: jmenghan <[email protected]> Co-authored-by: mbaradi <[email protected]> Co-authored-by: Manu Jain <[email protected]> Co-authored-by: Govardhan N <[email protected]> Co-authored-by: Kishore <[email protected]> Co-authored-by: Kishore Ponmuthuramalingam <[email protected]> Co-authored-by: ankmangl <[email protected]> Co-authored-by: Govardhan N <[email protected]> Co-authored-by: urmitchauhan <[email protected]> Co-authored-by: sidkotha <[email protected]>
…ners (webex#384) * [macOS][BnC] Focus Accessibility: Implement manual KeyView focus at containers - Implement focus manager logic at containers - Implement focus protocol at Input.Toggle, ChoiceSet - Implement key view setup logic - Create unit test * minor changes
…#386) - Implement focus manager logic at ActionSet, ImageSet, Image - Implement focus protocol logic at SelectAction - Implement key view setup logic - add unit test
* Toggle Visibility Changes * Id Changed * ColumnSet Changes removed
…rd/Toggle (webex#388) - Implement logic for handle show card element order with insert pointer head - Implement logic for handle skip the hidden view and assign immediate next view - optimise recalculateKeyViewLoop logic - Implement refocus logic for action.Toggle and show card - add unit test
- add focus ring
* [macOS] Fix: Focus goes inside the hidden ShowCard - update MultilineText input - update Date-Time Input - update test * revert select and hitTest logic - In certain cases, it gives a selection option that we do not require in the date-time field. (bug) - handle canBecomeKeyView with visible rect
* Added Changes * Added tests * Updated test
…just the edges (webex#396) * Fix: [macOS] collections element bleeds to bottom of card instead of just the edges - refactor bleed configuration at base render - add new methods in collection element view - bug fix - add new unit test for bleed * bleed focus revert * make bleed value struct
* Card Vertical Alignment * Height Calculation FIxed
- make new delegate method for get callback on action - change open url action delegate - change text view open url logic - test
* Fixed swiftlint issues * Fixed telemetry issue
* Updated code to allow debug of cpp on mac * Fixed build issue
* Fixed bug with associated inputs in show card * Added test json * Updated pbxproj file
mukuagar
changed the title
Shared code update jan 2024
Shared code update Till Jan 2 2024
Jan 22, 2024
ramkrishnajana
approved these changes
Jan 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related Issue
A Pull Request should close a single issue; multiple issues can be closed when the issues are small and related, but that should be an exception not the rule. Please keep Pull Requests small and targeted; large 'code drops' with dozens of files will be closed and asked to split into reviewable pieces. Reviews that need to be large due to dependencies will be
reviewed on a case-by-case basis.
Please use one of the well-known github fixes keywords to reference
the issue fixed with this PR (eg Fixes #). If an issue doesn't yet exist please create one to aid
in issue tracking.
NOTE: For multiple issues resolved by this PR use the corresponding keywords every time in a comma-delimited list per the reference
page above.
Description
This PR invloves bringing the shared code and the related objective c bridge for mac up to date with Microsoft
Sample Card
If appropriate, please include a link to a card in one of the samples directories that can be used to validate this change. This can be an existing card or a card added with this PR.
How Verified
How you verified the fix, including one or all of the following:
will aid in code reviews or corresponding fixes on other platforms for eg.