Merge branch 'microsoft:main' into fork-main

Vasanth-S · web-flow · commit 463eeb6b3e1e · 2021-09-18T12:59:11.000+05:30
diff --git a/samples/v1.5/Test/TextBlock.Markdown.NumberStart.json b/samples/v1.5/Test/TextBlock.Markdown.NumberStart.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+  "type": "AdaptiveCard",
+  "version": "1.3",
+  "body": [
+	{
+	  "type": "TextBlock",
+	  "text": "1. First item in the list;"
+	},
+	{
+	  "type": "TextBlock",
+	  "text": "2. Second item in the list;"
+	},
+	{
+	  "type": "TextBlock",
+	  "text": "3. Third item in the list;"
+	},
+	{
+		"type": "TextBlock",
+		"text": "10. The tenth thing\r10. The list is still going!\r10. Should be 12!",
+		"wrap": true
+	}
+  ]
+}
diff --git a/source/android/adaptivecards/src/androidTest/java/io/adaptivecards/objectmodel/TextBlockPropertiesTest.java b/source/android/adaptivecards/src/androidTest/java/io/adaptivecards/objectmodel/TextBlockPropertiesTest.java
@@ -380,6 +380,32 @@ public void TestNumberedList () throws Exception
         Assert.assertEquals(expectedHtml, html);
     }
 
+    @Test
+    public void TestNumberedListHonoursStart () throws Exception
+    {
+        final String textWithNewLines = "18. Green\r19. Orange\r20. Blue";
+        // This looks counter intuitive but without the replacement of '\n\r' for "<br/>" the
+        // output will only contain a blank space where '\n' is expected
+        final String expectedHtml = "18. Green\n19. Orange\n20. Blue";
+
+        String html = RendererUtil.handleSpecialText(textWithNewLines).toString();
+
+        Assert.assertEquals(expectedHtml, html);
+    }
+
+    @Test
+    public void TestNumberedListIncrementsCorrectly () throws Exception
+    {
+        final String textWithNewLines = "18. Green\r18. Orange\r18. Blue";
+        // This looks counter intuitive but without the replacement of '\n\r' for "<br/>" the
+        // output will only contain a blank space where '\n' is expected
+        final String expectedHtml = "18. Green\n19. Orange\n20. Blue";
+
+        String html = RendererUtil.handleSpecialText(textWithNewLines).toString();
+
+        Assert.assertEquals(expectedHtml, html);
+    }
+
     // This string is the result for an empty textblock or a textblock with all default values
     public static final String s_defaultTextBlock = "{\"text\":\"\",\"type\":\"TextBlock\"}\n";
 
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/ActionLayoutRenderer.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/ActionLayoutRenderer.java
@@ -49,12 +49,14 @@ public View renderActions(
         HostConfig hostConfig,
         RenderArgs renderArgs) throws AdaptiveFallbackException
     {
-        long size;
-        if (baseActionElementList == null || (size = baseActionElementList.size()) <= 0)
+
+        if (baseActionElementList == null)
         {
             return null;
         }
 
+        long size = baseActionElementList.size();
+
         LinearLayout actionButtonsLayout = new LinearLayout(context);
         actionButtonsLayout.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
         int alignment = hostConfig.GetActions().getActionAlignment().swigValue();
diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/RendererUtil.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/RendererUtil.java
@@ -7,8 +7,13 @@
 import android.text.Html;
 import android.text.Spanned;
 
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 
+import java.util.ArrayDeque;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
@@ -122,17 +127,27 @@ public static CharSequence trimHtmlString(Spanned htmlString)
     }
 
     // Class to replace ul and li tags
-    public static class UlTagHandler implements Html.TagHandler
+    public static class UlTagHandler implements Html.TagHandler, ContentHandler
     {
         private int tagNumber = 0;
         private boolean orderedList = false;
+        private ContentHandler defaultContentHandler = null;
+        private Editable text = null;
+        private ArrayDeque<Boolean> tagStatusQueue = new ArrayDeque<>();
 
-        @Override
-        public void handleTag(boolean opening, String tag, Editable output, XMLReader xmlReader)
+        private String getAttribute(String attributeName, Attributes attributes)
+        {
+            return attributes.getValue(attributeName);
+        }
+
+        public boolean handleTag(boolean opening, String tag, Editable output, Attributes attributes)
         {
+            boolean tagWasHandled = false;
+
             if (tag.equals("ul") && !opening)
             {
                 output.append("\n");
+                tagWasHandled = true;
             }
 
             if (tag.equals("listItem") && opening)
@@ -148,13 +163,121 @@ public void handleTag(boolean opening, String tag, Editable output, XMLReader xm
                 {
                     output.append("\n• ");
                 }
+                tagWasHandled = true;
             }
 
             if (tag.equals("ol") && opening)
             {
                 orderedList = true;
-                tagNumber = 1;
+                String tagNumberString = getAttribute("start", attributes);
+
+                int retrievedTagNumber = 1;
+                if (tagNumberString != null)
+                {
+                    retrievedTagNumber = Integer.parseInt(tagNumberString);
+                }
+
+                tagNumber = retrievedTagNumber;
+                tagWasHandled = true;
             }
+
+            return tagWasHandled;
+        }
+
+        @Override
+        public void handleTag(boolean opening, String tag, Editable output, XMLReader xmlReader)
+        {
+            if (defaultContentHandler == null)
+            {
+                // save input text
+                text = output;
+
+                // store default XMLReader object
+                defaultContentHandler = xmlReader.getContentHandler();
+
+                // replace content handler with our own that forwards to calls to default when needed
+                xmlReader.setContentHandler(this);
+
+                // handle endElement() callback for <inject/> tag
+                tagStatusQueue.addLast(Boolean.FALSE);
+            }
+        }
+
+        // ContentHandler override methods
+        @Override
+        public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
+        {
+            boolean isHandled = handleTag(true, localName, text, attributes);
+            tagStatusQueue.addLast(isHandled);
+
+            if (!isHandled)
+            {
+                defaultContentHandler.startElement(uri, localName, qName, attributes);
+            }
+        }
+
+        @Override
+        public void endElement(String uri, String localName, String qName) throws SAXException
+        {
+            if (!tagStatusQueue.removeLast())
+            {
+                defaultContentHandler.endElement(uri, localName, qName);
+            }
+
+            handleTag(false, localName, text, (Attributes)null);
+        }
+
+        @Override
+        public void setDocumentLocator(Locator locator)
+        {
+            defaultContentHandler.setDocumentLocator(locator);
+        }
+
+        @Override
+        public void startDocument() throws SAXException
+        {
+            defaultContentHandler.startDocument();
+        }
+
+        @Override
+        public void endDocument() throws SAXException
+        {
+            defaultContentHandler.endDocument();
+        }
+
+        @Override
+        public void startPrefixMapping(String prefix, String uri) throws SAXException
+        {
+            defaultContentHandler.startPrefixMapping(prefix, uri);
+        }
+
+        @Override
+        public void endPrefixMapping(String prefix) throws SAXException
+        {
+            defaultContentHandler.endPrefixMapping(prefix);
+        }
+
+        @Override
+        public void characters(char[] chars, int start, int length) throws SAXException {
+            defaultContentHandler.characters(chars, start, length);
+        }
+
+        @Override
+        public void ignorableWhitespace(char[] chars, int start, int length) throws SAXException
+        {
+            defaultContentHandler.ignorableWhitespace(chars, start, length);
+        }
+
+        @Override
+        public void processingInstruction(String target, String data) throws SAXException
+        {
+            defaultContentHandler.processingInstruction(target, data);
+        }
+
+        @Override
+        public void skippedEntity(String name) throws SAXException
+        {
+            defaultContentHandler.skippedEntity(name);
         }
     }
 
diff --git a/source/android/uitestapp/build.gradle b/source/android/uitestapp/build.gradle
@@ -29,7 +29,8 @@ android {
             // including shared samples in APK assets
             assets {
                 srcDirs {
-                    "../../../samples/v1.3/Scenarios/"
+                    ["../../../samples/v1.3/Scenarios/",
+                    "../../../samples/v1.5/Test/"]
                 }
             }
         }
diff --git a/source/android/uitestapp/src/androidTest/java/io.adaptivecards.uitestapp/UiTests.kt b/source/android/uitestapp/src/androidTest/java/io.adaptivecards.uitestapp/UiTests.kt
@@ -8,6 +8,8 @@ import org.junit.Rule
 import io.adaptivecards.uitestapp.RenderCardUiTestAppActivity
 import kotlin.Throws
 import androidx.test.espresso.Espresso
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.ViewAssertion
 import org.hamcrest.Matchers
 import androidx.test.espresso.action.ViewActions
 import io.adaptivecards.uitestapp.TestHelpers
@@ -58,4 +60,17 @@ class UiTests {
         TestHelpers.goToInputsScreen()
         Espresso.onData(Matchers.`is`(RetrievedInput("dueDate", "2021-02-04"))).check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
     }
+
+    @Test
+    @Throws(Exception::class)
+    fun RenderedMarkdownStartsWithRightNumber() {
+        Espresso.onData(Matchers.`is`("TextBlock.Markdown.NumberStart.json")).perform(ViewActions.click())
+        TestHelpers.goToRenderedCardScreen()
+
+        Espresso.onView(ViewMatchers.withText("1. First item in the list;")).check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(ViewMatchers.withText("2. Second item in the list;")).check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(ViewMatchers.withText("3. Third item in the list;")).check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withText("10. The tenth thing\n11. The list is still going!\n12. Should be 12!")).check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
 }
diff --git a/source/android/uitestapp/src/main/java/io/adaptivecards/uitestapp/ui/test_cases/TestCasesFragment.kt b/source/android/uitestapp/src/main/java/io/adaptivecards/uitestapp/ui/test_cases/TestCasesFragment.kt
@@ -40,8 +40,6 @@ class TestCasesFragment : Fragment() {
 
     private fun populateTestCaseList () {
         try {
-            val something : MutableList<String> = mutableListOf("a", "b", "c")
-
             val activity : FragmentActivity = requireActivity();
             val assets : AssetManager = activity.assets;
             val assetsList = assets.list("");
diff --git a/source/nodejs/adaptivecards-designer/src/adaptivecards-designer.css b/source/nodejs/adaptivecards-designer/src/adaptivecards-designer.css
@@ -949,18 +949,18 @@ a.default-ac-anchor:visited:active {
     height: 31px;
     background-color: #EEEEEE;
     color: black;
-    border: 1px solid #CCCCCC;
+    border: 1px solid #888888;
     border-radius: 2px;
 }
 
 .default-ac-pushButton:hover, .acd-dialog-button:hover {
     /* background-color: #DDDDDD; */
-    border: 1px solid #BBBBBB;
+    border: 1px solid #777777;
 }
 
 .default-ac-pushButton:active, .acd-dialog-button:active {
     /* background-color: #CCCCCC; */
-    border: 1px solid #BBBBBB;
+    border: 1px solid #777777;
 }
 
 .default-ac-pushButton.subdued {
diff --git a/source/nodejs/adaptivecards-site/themes/adaptivecards/source/content/pending.png b/source/nodejs/adaptivecards-site/themes/adaptivecards/source/content/pending.png

Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,14 @@ public View renderActions(`
`49`	`49`	`HostConfig hostConfig,`
`50`	`50`	`RenderArgs renderArgs) throws AdaptiveFallbackException`
`51`	`51`	`{`
`52`		`- long size;`
`53`		`- if (baseActionElementList == null \|\| (size = baseActionElementList.size()) <= 0)`
	`52`	`+`
	`53`	`+ if (baseActionElementList == null)`
`54`	`54`	`{`
`55`	`55`	`return null;`
`56`	`56`	`}`
`57`	`57`
	`58`	`+ long size = baseActionElementList.size();`
	`59`	`+`
`58`	`60`	`LinearLayout actionButtonsLayout = new LinearLayout(context);`
`59`	`61`	`actionButtonsLayout.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));`
`60`	`62`	`int alignment = hostConfig.GetActions().getActionAlignment().swigValue();`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@ android {`
`29`	`29`	`// including shared samples in APK assets`
`30`	`30`	`assets {`
`31`	`31`	`srcDirs {`
`32`		`- "../../../samples/v1.3/Scenarios/"`
	`32`	`+ ["../../../samples/v1.3/Scenarios/",`
	`33`	`+ "../../../samples/v1.5/Test/"]`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -949,18 +949,18 @@ a.default-ac-anchor:visited:active {`
`949`	`949`	`height: 31px;`
`950`	`950`	`background-color: #EEEEEE;`
`951`	`951`	`color: black;`
`952`		`- border: 1px solid #CCCCCC;`
	`952`	`+ border: 1px solid #888888;`
`953`	`953`	`border-radius: 2px;`
`954`	`954`	`}`
`955`	`955`
`956`	`956`	`.default-ac-pushButton:hover, .acd-dialog-button:hover {`
`957`	`957`	`/* background-color: #DDDDDD; */`
`958`		`- border: 1px solid #BBBBBB;`
	`958`	`+ border: 1px solid #777777;`
`959`	`959`	`}`
`960`	`960`
`961`	`961`	`.default-ac-pushButton:active, .acd-dialog-button:active {`
`962`	`962`	`/* background-color: #CCCCCC; */`
`963`		`- border: 1px solid #BBBBBB;`
	`963`	`+ border: 1px solid #777777;`
`964`	`964`	`}`
`965`	`965`
`966`	`966`	`.default-ac-pushButton.subdued {`