Skip to content

Commit

Permalink
Feature/prepare pull request (#32)
Browse files Browse the repository at this point in the history 
* Add MSC directive to prevent cppcorecheck build failures on non-VS builds (microsoft#1552)

* cleaned up exception handling in loading image (microsoft#1526)

* Enable member init checks and fix errors (microsoft#1566)

* A class with only static methods and no state should just be a namespace. (microsoft#1567)

* Support OnParseAction Handler (microsoft#1570)

* Honour preexpandSingleShowCardAction and weight of fact title from HostConfig

* Addressed comments

* Support OnParseAction

* resolved minor comments

* Jwoo/ios render sync (microsoft#1547)

* make rendering to be syncronoush by default

* updated custom textblock renderer

* changes before CR

* CR update

* CR update

* [.NET] Prevent async exceptions from tearing down the process (microsoft#1561)

* Prevent unobserved exceptions from taking down the process.

If rendering fails, report the error but do not throw on a background thread.

* Add configuration to sign nuget packages

* fixed dll/project names in comments

* Fix actions parent not being set before actions are parsed (microsoft#1573)

* Replace ContainerStyle string enum with class + static fields

* Update default card

* Improve hover behavior for Image with selectAction

* Finalize support for width/height in Image and Column

* Add support for icons on action buttons

* Cleanup

* Fix handling of buttons without title

* Fix broken preExpandSingleShowCardAction handling

* Fix actions parent not being set before actions are parsed

* Enable const cppcore checks and fix fallout (microsoft#1575)

* Add Events for media play and end (microsoft#1546)

* [Android] Add vertical stretch property (microsoft#1525)

* Add vertical stretch to android

* Remove non related test file

* Fix comments in FactSetRendered

* Add tests as linked tests

* Update tests results from TestApp with new tests

* Jwoo/ios makrdown optimized (microsoft#1554)

* make rendering to be syncronoush by default

* updated custom textblock renderer

* optimized use of html rendering

* fixed factset issue

* fixed build compatability issues below iOS 11.3

* fixes before CR

* CR comments fix

* Added additional headers to public lis in framework. (microsoft#1562)

* make rendering to be syncronoush by default

* updated custom textblock renderer

* optimized use of html rendering

* fixed factset issue

* made headers public for customizing buttons

* added ACRUILable.h

* reverted wrong merge

* Enable CPPCORECHECK_DECLARATION_WARNINGS and fix errors (microsoft#1579)

* Enable Declaration warnings and first round of fixes

* Clean up remaining unnamed objects warnings and disable C26426 in enums.cpp

* added ability to scroll when there are more buttons than viewing area (microsoft#1581)

* make rendering to be syncronoush by default

* updated custom textblock renderer

* optimized use of html rendering

* fixed factset issue

* fixed build compatability issues below iOS 11.3

* fixes before CR

* added UIScrollView to ActionSet

* edits before CR

* Added sample json and updates b4 CR

* Enable "rule of five" checker, fix errors (microsoft#1585)

* Add Teams containers (microsoft#1469)

Add support for more properties in property sheet
Add initial support for snippets

* [iOS] Add vertical stretch support (microsoft#1584)

* Add vertical stretch to android

* make rendering to be syncronoush by default

* updated custom textblock renderer

* optimized use of html rendering

* fixed factset issue

* Remove non related test file

* Fix comments in FactSetRendered

* Add tests as linked tests

* Update tests results from TestApp with new tests

* Add vertical stretch for items

* Remove 'changes' from merge

* Add vertical stretch tests to solution

* Fix issue for image in columnsets rendering

* Fix issue for images being shorter than other columns in columnset

* Keep alignment leading for cards with no stretchable items

* Add new test for auto size image

* Enable all cppcorecheck class warnings and fix errors (microsoft#1601)

* Enable override checker and fix errors

* Enable function hiding warning and fix errors

* Enable all class warnings and fix errors

* [iOS] Add missing test for Vertical Stretch (microsoft#1603)

* Add missing test

* Fix spaces in json

* Update GetResource method to include type and to support media   (microsoft#1583)

* Update get resource method to include type and to support media

* Handle opening media via resource resolver when play is pressed (microsoft#1586)

Handle opening media via resource resolver when play is pressed

* Enable unit test code coverage in Debug Win32 builds (microsoft#1611)

* Test source file updates (microsoft#1551)

* Test file updates

* Jwoo/ios custom styling (microsoft#1474)

* XIB first commit

* fixes merge error

* updated InputView with XIB

updated the style of UIButtons

 added UITableViewCell xib for compact mode

removed comments

* code clean up

* added ACRbutton.xib

* Added Xib for CompactCell

* added ACRButton.xib

* allowed column with numeric width value to stretch (microsoft#1595)

* allowed column with numeric width value to stretch

* fix merge and remove spacing for the first item

* [UWP][Android][iOS] Add aesthetic fix Icons in Actions (microsoft#1612)

* Add aesthetic fix to UWP

* Aesthetic fix for android

* Aesthetic fix for iOS

* Add json test files to project

* Fix formatting

* updated showcard rendering position (microsoft#1600)

removed comments

* compact style choice set "make choice" row will reflect user choice (microsoft#1596)

* in progress

* when user chooses, user choice will be shown

* updated default message

* value is used instead of "Make Choice"

* handles cases where compact style lacking defaults (microsoft#1627)

* fixed separator issue (microsoft#1629)

* Remove Stretch from vertical content alignment (microsoft#1630)

* Jwoo/explicit image size ios (microsoft#1374)

* explicit image changes

* Added 'Explicit' enum value

* uwp changes

* uwp changes

* added explicit image sizing option for ios

* removed division

* fixes extra spacing issue in UICollectionView (microsoft#1628)

* fixes extra spacing issue in UICollectionView

* refined intrinsic content size for collection view

* fixed precision error

* fixes url loading sync issue for actions (microsoft#1641)

* fixes url loading sync issue for actions

removed hard coded image icon placement

* fixed indentation and changed variable name

* Fix media controls (microsoft#1614)

* [TS] Fixed Input.Text style and horizontalAlignment roundtrip; added test (microsoft#1636)

* Input.Text roundtrip, added test and fix

* feedback -vertical spaces

* Change private for protected in all Renderers constructors (microsoft#1649)

* Add vertical scroll support (microsoft#1650)

* Jwoo/ios custom background image loader (microsoft#1642)

* fixes url loading sync issue for actions

removed hard coded image icon placement

* allows custom BG IMG renderer

* Added CustomImageRenderer to sample

* removed CoreGraphics framework as it's not used

* added a test to ensure Unicode/Emoji support (microsoft#1647)

:shipit:

* multiline input and input limit for textview and textfield (microsoft#1643)

* initial commit for multiline input and input limit

implmt plc hld txt; rmved max len chg when not set

reverted json files

* Refactoring and code clean-up

* updated whitespaces

* Fixed newline char

* [Android] Refocus when a show card changes visibility (microsoft#1651)

* Refocus on show card

* Set focus for cards instead of input fields

* Revert "[Android] Refocus when a show card changes visibility (microsoft#1651)" (microsoft#1653)

This reverts commit f2a899a.
  • Loading branch information
@ismanapa
ismanapa committed Jun 28, 2018
1 parent a5f4677 commit d07083b
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 0 deletions.
4 changes: 4 additions & 0 deletions source/nodejs/adaptivecards-designer/css/card-designer.css
View file
Expand Up @@ -44,6 +44,10 @@
content: "\ECAB";
}

.acd-icon-image::before {
content: "\ECAB";
}

.acd-designersurface {
outline: none;
}
Expand Down
4 changes: 4 additions & 0 deletions source/nodejs/adaptivecards-designer/src/app.ts
View file
Expand Up @@ -716,4 +716,8 @@ window.onload = () => {
loadMonacoEditor(adaptiveCardSchema, monacoEditorLoaded);

updateCardFromJson();
<<<<<<< HEAD
};
=======
};
>>>>>>> microsoft/master
87 changes: 87 additions & 0 deletions source/nodejs/adaptivecards-designer/src/card-designer.ts
View file
Expand Up @@ -75,10 +75,17 @@ class NameValuePairEditor {
removeAction.title = "X";
removeAction.onExecute = (sender) => {
this.nameValuePairs.splice(i, 1);
<<<<<<< HEAD

this.changed(true);
}

=======

this.changed(true);
}

>>>>>>> microsoft/master
let actionSet = new Adaptive.ActionSet();
actionSet.addAction(removeAction);

Expand Down Expand Up @@ -920,7 +927,11 @@ export class CardElementPeer extends DesignerPeer {
if (cardElement instanceof Adaptive.CardElementContainer) {
for (var i = 0; i < cardElement.getItemCount(); i++) {
this.addChild(CardDesigner.cardElementPeerRegistry.createPeerInstance(this.designer, this, cardElement.getItemAt(i)));
<<<<<<< HEAD
}
=======
}
>>>>>>> microsoft/master
}

for (var i = 0; i < this.cardElement.getActionCount(); i++) {
Expand Down Expand Up @@ -994,7 +1005,11 @@ export class CardElementPeer extends DesignerPeer {
}

boundingRect: Rect = null;
<<<<<<< HEAD

=======

>>>>>>> microsoft/master
getBoundingRect(): Rect {
let designSurfaceOffset = this.designer.getDesignerSurfaceOffset();
let cardElementBoundingRect = this.cardElement.renderedElement.getBoundingClientRect();
Expand Down Expand Up @@ -1206,7 +1221,11 @@ export class ColumnPeer extends TypedCardElementPeer<Adaptive.Column> {

addPropertySheetEntries(card: Adaptive.AdaptiveCard, includeHeader: boolean) {
super.addPropertySheetEntries(card, includeHeader);
<<<<<<< HEAD

=======

>>>>>>> microsoft/master
let width = addLabelAndInput(card, "Width:", Adaptive.TextInput);

if (this.cardElement.width instanceof Adaptive.SizeAndUnit) {
Expand Down Expand Up @@ -1244,7 +1263,11 @@ export class ColumnPeer extends TypedCardElementPeer<Adaptive.Column> {

this.changed(false);
}
<<<<<<< HEAD

=======

>>>>>>> microsoft/master
let actionSelector = createActionSelector(card, this.cardElement.selectAction ? this.cardElement.selectAction.getJsonTypeName() : "none");

actionSelector.input.onValueChanged = () => {
Expand Down Expand Up @@ -1522,7 +1545,11 @@ export class ImagePeer extends TypedCardElementPeer<Adaptive.Image> {
catch (e) {
this.cardElement.pixelWidth = null;
}
<<<<<<< HEAD

=======

>>>>>>> microsoft/master
this.changed(false);
}

Expand All @@ -1544,6 +1571,7 @@ export class ImagePeer extends TypedCardElementPeer<Adaptive.Image> {
catch (e) {
this.cardElement.pixelHeight = null;
}
<<<<<<< HEAD

this.changed(false);
}
Expand All @@ -1564,11 +1592,36 @@ export class ImagePeer extends TypedCardElementPeer<Adaptive.Image> {
backgroundColor.input.defaultValue = this.cardElement.backgroundColor;
backgroundColor.input.onValueChanged = () => {
this.cardElement.backgroundColor = backgroundColor.input.value;
=======

this.changed(false);
}

var style = addLabelAndInput(card, "Style:", Adaptive.ChoiceSetInput);
style.input.isCompact = true;
style.input.choices.push(new Adaptive.Choice("Default", Adaptive.ImageStyle.Default.toString()));
style.input.choices.push(new Adaptive.Choice("Person", Adaptive.ImageStyle.Person.toString()));
style.input.defaultValue = this.cardElement.style.toString();
style.input.onValueChanged = () => {
this.cardElement.style = <Adaptive.ImageStyle>parseInt(style.input.value);
>>>>>>> microsoft/master

this.changed(false);
}

<<<<<<< HEAD
var actionSelector = createActionSelector(card, this.cardElement.selectAction ? this.cardElement.selectAction.getJsonTypeName() : "none");
=======
var backgroundColor = addLabelAndInput(card, "Background color:", Adaptive.TextInput);
backgroundColor.input.placeholder = "(not set) Format: #RRGGBB";
backgroundColor.input.defaultValue = this.cardElement.backgroundColor;
backgroundColor.input.onValueChanged = () => {
this.cardElement.backgroundColor = backgroundColor.input.value;

this.changed(false);
}
}
>>>>>>> microsoft/master

actionSelector.input.onValueChanged = () => {
if (actionSelector.input.value == "none") {
Expand All @@ -1581,11 +1634,21 @@ export class ImagePeer extends TypedCardElementPeer<Adaptive.Image> {
this.changed(true);
}

<<<<<<< HEAD
if (this.cardElement.selectAction) {
let selectActionPeer = CardDesigner.actionPeerRegistry.createPeerInstance(this.designer, null, this.cardElement.selectAction);
selectActionPeer.addPropertySheetEntries(card, false);
selectActionPeer.onChanged = (sender: DesignerPeer, updatePropertySheet: boolean) => { this.changed(updatePropertySheet); };
}
=======
this.changed(true);
}

if (this.cardElement.selectAction) {
let selectActionPeer = CardDesigner.actionPeerRegistry.createPeerInstance(this.designer, null, this.cardElement.selectAction);
selectActionPeer.addPropertySheetEntries(card, false);
selectActionPeer.onChanged = (sender: DesignerPeer, updatePropertySheet: boolean) => { this.changed(updatePropertySheet); };
>>>>>>> microsoft/master
}
}
}
Expand Down Expand Up @@ -2260,10 +2323,17 @@ export class CardDesigner {
if (canDrop) {
for (var i = 0; i < currentPeer.getChildCount(); i++) {
var deeperResult = this.internalFindDropTarget(pointerPosition, currentPeer.getChildAt(i), forPeer);
<<<<<<< HEAD

if (deeperResult) {
result = deeperResult;

=======

if (deeperResult) {
result = deeperResult;

>>>>>>> microsoft/master
break;
}
}
Expand Down Expand Up @@ -2303,7 +2373,11 @@ export class CardDesigner {
if (isExpanded) {
if (!peer) {
peer = new AdaptiveCardPeer(this, action.card);
<<<<<<< HEAD

=======

>>>>>>> microsoft/master
var parentPeer = this.findActionPeer(action);

if (parentPeer) {
Expand Down Expand Up @@ -2474,8 +2548,21 @@ export class CardDesigner {
this._designerSurface.appendChild(this._dragHandle.renderedElement);
this._designerSurface.appendChild(this._removeCommandElement);
this._designerSurface.appendChild(this._peerCommandsHostElement);
<<<<<<< HEAD

this.updateLayout();
=======

this.updateLayout();
}

parseCard(json: string) {
this._lastParseErrors = [];

this.card.parse(JSON.parse(json), this._lastParseErrors);

this.render();
>>>>>>> microsoft/master
}

parseCard(json: string) {
Expand Down
4 changes: 4 additions & 0 deletions source/nodejs/adaptivecards-designer/src/containers/teams-container.ts
View file
Expand Up @@ -334,4 +334,8 @@ export class DarkTeamsContainer extends BaseTeamsContainer {
}
);
}
<<<<<<< HEAD
}
=======
}
>>>>>>> microsoft/master

0 comments on commit d07083b

Please sign in to comment.