From b2aeb0196480cb868ac959a4bbb1a3bae4b08d28 Mon Sep 17 00:00:00 2001 From: himanshujoshi848 Date: Tue, 31 Oct 2023 20:12:06 +0530 Subject: [PATCH 1/4] Added separate configuration for form submit button in hidePostCTA --- app/src/main/assets/applozic-settings.json | 3 ++- .../conversation/richmessaging/types/KmFormRichMessage.java | 2 +- .../uiwidgets/kommunicate/utils/KmThemeHelper.java | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/assets/applozic-settings.json b/app/src/main/assets/applozic-settings.json index c9382d14b..e2d8e1f80 100644 --- a/app/src/main/assets/applozic-settings.json +++ b/app/src/main/assets/applozic-settings.json @@ -160,7 +160,8 @@ "hidePostCTA": { "submit": false, "link": false, - "quickReply": false + "quickReply": false, + "formSubmitButton": false }, "receiverNameTextColor": "#5C6677", "innerTimestampDesign": false, diff --git a/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/conversation/richmessaging/types/KmFormRichMessage.java b/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/conversation/richmessaging/types/KmFormRichMessage.java index 92781d2c0..29ff8b138 100644 --- a/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/conversation/richmessaging/types/KmFormRichMessage.java +++ b/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/conversation/richmessaging/types/KmFormRichMessage.java @@ -39,7 +39,7 @@ public void createRichMessage(boolean isMessageProcessed) { final KmFormItemAdapter formItemAdapter = new KmFormItemAdapter(context, kmRichMessageModel.getFormModelList(), message.getKeyString(), alCustomizationSettings); alFormLayoutRecycler.setAdapter(formItemAdapter); - if (isMessageProcessed && themeHelper.hideSubmitButtonsPostCTA()) { + if (isMessageProcessed && themeHelper.hideFormSubmitButtonsPostCTA()) { return; } diff --git a/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/kommunicate/utils/KmThemeHelper.java b/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/kommunicate/utils/KmThemeHelper.java index 49d5fb599..53faa4041 100644 --- a/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/kommunicate/utils/KmThemeHelper.java +++ b/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/kommunicate/utils/KmThemeHelper.java @@ -20,6 +20,7 @@ public class KmThemeHelper implements KmCallback { private static final String SUBMIT_BUTTON = "submit"; private static final String LINK_BUTTON = "link"; private static final String QUICK_REPLIES = "quickReply"; + private static final String FORM_SUBMIT_BUTTON = "formSubmitButton"; private static KmThemeHelper kmThemeHelper; private final Context context; private final KmAppSettingPreferences appSettingPreferences; @@ -121,6 +122,11 @@ public boolean hideSubmitButtonsPostCTA() { return getHidePostCTA().get(SUBMIT_BUTTON) != null ? getHidePostCTA().get(SUBMIT_BUTTON) : false; } + @SuppressWarnings("ConstantConditions") + public boolean hideFormSubmitButtonsPostCTA() { + return getHidePostCTA().get(FORM_SUBMIT_BUTTON) != null ? getHidePostCTA().get(FORM_SUBMIT_BUTTON) : false; + } + @SuppressWarnings("ConstantConditions") public boolean hideLinkButtonsPostCTA() { return getHidePostCTA().get(LINK_BUTTON) != null ? getHidePostCTA().get(LINK_BUTTON) : false; From 3d967e37502eb6a538d460adc13e20aa4aaf9acc Mon Sep 17 00:00:00 2001 From: himanshujoshi848 Date: Tue, 31 Oct 2023 20:13:55 +0530 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 718dbd236..322bb05ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ The changelog for [Kommunicate-Android-Chat-SDK](https://github.com/Kommunicate-io/Kommunicate-Android-Chat-SDK). Also see the [releases](https://github.com/Kommunicate-io/Kommunicate-Android-Chat-SDK/releases) on Github. +## Unreleased +1) Added configuration for form submit button in hidePostCTA ## Kommunicate Android SDK 2.8.4 1) Reduce time taken for conversation creation ## Kommunicate Android SDK 2.8.3 From 922ca73c6b838087b7ce441a7797f7b6689ca260 Mon Sep 17 00:00:00 2001 From: himanshujoshi848 Date: Thu, 2 Nov 2023 11:47:53 +0530 Subject: [PATCH 3/4] changed the flag name in applozic-settings.json --- app/src/main/assets/applozic-settings.json | 2 +- .../mobicomkit/uiwidgets/kommunicate/utils/KmThemeHelper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/assets/applozic-settings.json b/app/src/main/assets/applozic-settings.json index e2d8e1f80..7e3c60c26 100644 --- a/app/src/main/assets/applozic-settings.json +++ b/app/src/main/assets/applozic-settings.json @@ -161,7 +161,7 @@ "submit": false, "link": false, "quickReply": false, - "formSubmitButton": false + "hidePostFormSubmit": false }, "receiverNameTextColor": "#5C6677", "innerTimestampDesign": false, diff --git a/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/kommunicate/utils/KmThemeHelper.java b/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/kommunicate/utils/KmThemeHelper.java index 53faa4041..65a1b1c59 100644 --- a/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/kommunicate/utils/KmThemeHelper.java +++ b/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/kommunicate/utils/KmThemeHelper.java @@ -20,7 +20,7 @@ public class KmThemeHelper implements KmCallback { private static final String SUBMIT_BUTTON = "submit"; private static final String LINK_BUTTON = "link"; private static final String QUICK_REPLIES = "quickReply"; - private static final String FORM_SUBMIT_BUTTON = "formSubmitButton"; + private static final String FORM_SUBMIT_BUTTON = "hidePostFormSubmit"; private static KmThemeHelper kmThemeHelper; private final Context context; private final KmAppSettingPreferences appSettingPreferences; From 4a3835803ebc2c0d6fa1a1218b4eeb054f880fd3 Mon Sep 17 00:00:00 2001 From: himanshujoshi848 Date: Thu, 2 Nov 2023 17:35:58 +0530 Subject: [PATCH 4/4] Minor code fix --- .../richmessaging/types/KmFormRichMessage.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/conversation/richmessaging/types/KmFormRichMessage.java b/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/conversation/richmessaging/types/KmFormRichMessage.java index 29ff8b138..b60c18377 100644 --- a/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/conversation/richmessaging/types/KmFormRichMessage.java +++ b/kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/conversation/richmessaging/types/KmFormRichMessage.java @@ -39,15 +39,16 @@ public void createRichMessage(boolean isMessageProcessed) { final KmFormItemAdapter formItemAdapter = new KmFormItemAdapter(context, kmRichMessageModel.getFormModelList(), message.getKeyString(), alCustomizationSettings); alFormLayoutRecycler.setAdapter(formItemAdapter); - if (isMessageProcessed && themeHelper.hideFormSubmitButtonsPostCTA()) { - return; - } - List actionModelList = new ArrayList<>(); for (Object object : kmRichMessageModel.getFormModelList()) { if (object instanceof KmFormPayloadModel) { KmFormPayloadModel formPayloadModel = (KmFormPayloadModel) object; + + if (isMessageProcessed && themeHelper.hideFormSubmitButtonsPostCTA() && KmFormPayloadModel.Type.SUBMIT.getValue().equals(formPayloadModel.getType())) { + continue; + } + if (KmFormPayloadModel.Type.SUBMIT.getValue().equals(formPayloadModel.getType()) || KmFormPayloadModel.Type.ACTION.getValue().equals(formPayloadModel.getType()) || TextUtils.isEmpty(formPayloadModel.getType())) { actionModelList.add(formPayloadModel.getAction()); }