From 0cc141b93ff0640dde0d736b8be29bb089b80bdd Mon Sep 17 00:00:00 2001 From: karthik Date: Fri, 28 Apr 2023 12:47:57 -0700 Subject: [PATCH 1/3] Date format issue resolved. --- .../renderer/readonly/RichTextBlockRenderer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/RichTextBlockRenderer.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/RichTextBlockRenderer.java index 15d9670284..55ead9765a 100644 --- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/RichTextBlockRenderer.java +++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/RichTextBlockRenderer.java @@ -24,6 +24,8 @@ import androidx.annotation.NonNull; import androidx.fragment.app.FragmentManager; +import java.util.Locale; + import io.adaptivecards.objectmodel.BaseActionElement; import io.adaptivecards.objectmodel.BaseCardElement; import io.adaptivecards.objectmodel.FontType; @@ -132,7 +134,10 @@ else if ((textRun = TextRun.dynamic_cast(inline)) == null) TextWeight textWeight = TextRendererUtil.computeTextWeight(hostConfig, TextStyle.Default, textRun.GetTextWeight(), renderArgs); boolean isSubtle = TextRendererUtil.computeIsSubtle(hostConfig, TextStyle.Default, textRun.GetIsSubtle(), renderArgs); FontType fontType = TextRendererUtil.computeFontType(hostConfig, TextStyle.Default, textRun.GetFontType(), renderArgs); - + if (textRun.GetLanguage() == null && textRun.GetLanguage().isEmpty()) + { + textRun.SetLanguage(Locale.getDefault().getLanguage()); + } DateTimeParser parser = new DateTimeParser(textRun.GetLanguage()); String formattedText = parser.GenerateString(textRun.GetTextForDateParsing()); From 672c6543aa050703aedc6cba4640069a4e96454f Mon Sep 17 00:00:00 2001 From: karthik Date: Fri, 28 Apr 2023 15:56:35 -0700 Subject: [PATCH 2/3] comment fixed --- .../objectmodel/RichTextElementProperties.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/RichTextElementProperties.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/RichTextElementProperties.java index 53e72d27fe..921340679a 100644 --- a/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/RichTextElementProperties.java +++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/objectmodel/RichTextElementProperties.java @@ -1,8 +1,8 @@ /* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 4.0.2 + * This file was automatically generated by SWIG (https://www.swig.org). + * Version 4.1.1 * - * Do not make changes to this file unless you know what you are doing--modify + * Do not make changes to this file unless you know what you are doing - modify * the SWIG interface file instead. * ----------------------------------------------------------------------------- */ From eb2d6a2ecaf7adcc6502035a4a00796eba9161fb Mon Sep 17 00:00:00 2001 From: karthik Date: Mon, 1 May 2023 12:41:52 -0700 Subject: [PATCH 3/3] comment fixed --- .../adaptivecards/renderer/readonly/RichTextBlockRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/RichTextBlockRenderer.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/RichTextBlockRenderer.java index 55ead9765a..e9370861c1 100644 --- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/RichTextBlockRenderer.java +++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/RichTextBlockRenderer.java @@ -134,7 +134,7 @@ else if ((textRun = TextRun.dynamic_cast(inline)) == null) TextWeight textWeight = TextRendererUtil.computeTextWeight(hostConfig, TextStyle.Default, textRun.GetTextWeight(), renderArgs); boolean isSubtle = TextRendererUtil.computeIsSubtle(hostConfig, TextStyle.Default, textRun.GetIsSubtle(), renderArgs); FontType fontType = TextRendererUtil.computeFontType(hostConfig, TextStyle.Default, textRun.GetFontType(), renderArgs); - if (textRun.GetLanguage() == null && textRun.GetLanguage().isEmpty()) + if (textRun.GetLanguage() == null || textRun.GetLanguage().isEmpty()) { textRun.SetLanguage(Locale.getDefault().getLanguage()); }