[MOB-5473] Embedded GA Release #698
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,4 +65,6 @@ pom.xml.tag | |
| pom.xml.releaseBackup | ||
| pom.xml.versionsBackup | ||
| pom.xml.next | ||
| release.properties | ||
|
|
||
| jacoco.exec | ||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| package com.iterable.iterableapi.ui.embedded | ||
|
|
||
| import android.graphics.drawable.GradientDrawable | ||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import android.widget.Button | ||
| import android.widget.ImageView | ||
| import android.widget.LinearLayout | ||
| import android.widget.TextView | ||
| import androidx.core.content.ContextCompat | ||
| import androidx.fragment.app.Fragment | ||
| import com.bumptech.glide.Glide | ||
| import com.google.android.flexbox.FlexboxLayout | ||
| import com.iterable.iterableapi.EmbeddedMessageElementsButton | ||
| import com.iterable.iterableapi.IterableApi | ||
| import com.iterable.iterableapi.IterableEmbeddedMessage | ||
| import com.iterable.iterableapi.ui.R | ||
|
|
||
| class IterableEmbeddedView( | ||
| private var viewType: IterableEmbeddedViewType, | ||
| private var message: IterableEmbeddedMessage, | ||
| private var config: IterableEmbeddedViewConfig? | ||
| ): Fragment() { | ||
|
|
||
| private val defaultBackgroundColor : Int by lazy { getDefaultColor(viewType, R.color.notification_background_color, R.color.banner_background_color, R.color.banner_background_color) } | ||
| private val defaultBorderColor : Int by lazy { getDefaultColor(viewType, R.color.notification_border_color, R.color.banner_border_color, R.color.banner_border_color) } | ||
| private val defaultPrimaryBtnBackgroundColor: Int by lazy { getDefaultColor(viewType, R.color.white, R.color.white, R.color.banner_button_color) } | ||
| private val defaultPrimaryBtnTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.banner_button_color, R.color.white) } | ||
| private val defaultSecondaryBtnBackgroundColor: Int by lazy { getDefaultColor(viewType, R.color.notification_background_color, R.color.white, R.color.white) } | ||
| private val defaultSecondaryBtnTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.banner_button_color, R.color.banner_button_color) } | ||
| private val defaultTitleTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.title_text_color, R.color.title_text_color) } | ||
| private val defaultBodyTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.body_text_color, R.color.body_text_color) } | ||
| private val defaultBorderWidth = 1 | ||
| private val defaultBorderCornerRadius = 8f | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle? | ||
| ): View? { | ||
|
|
||
| val view = when (viewType) { | ||
| IterableEmbeddedViewType.BANNER -> { | ||
| val bannerView = inflater.inflate(R.layout.banner_view, container, false) | ||
| bind(viewType, bannerView, message) | ||
| bannerView | ||
| } | ||
| IterableEmbeddedViewType.CARD -> { | ||
| val cardView = inflater.inflate(R.layout.card_view, container, false) | ||
| bind(viewType, cardView, message) | ||
| cardView | ||
| } | ||
| IterableEmbeddedViewType.NOTIFICATION -> { | ||
| val notificationView = inflater.inflate(R.layout.notification_view, container, false) | ||
| bind(viewType, notificationView, message) | ||
| notificationView | ||
| } | ||
| } | ||
|
|
||
| setDefaultAction(view, message) | ||
| configure(view, viewType, config) | ||
|
|
||
| return view | ||
| } | ||
|
|
||
| private fun configure(view: View, viewType: IterableEmbeddedViewType, config: IterableEmbeddedViewConfig?) { | ||
|
|
||
| val backgroundColor = config?.backgroundColor.takeIf { it != null } ?: defaultBackgroundColor | ||
| val borderColor = config?.borderColor.takeIf { it != null } ?: defaultBorderColor | ||
| val borderWidth = config?.borderWidth.takeIf { it != null } ?: defaultBorderWidth | ||
| val borderCornerRadius = config?.borderCornerRadius.takeIf { it != null } ?: defaultBorderCornerRadius | ||
|
|
||
| val primaryBtnBackgroundColor = config?.primaryBtnBackgroundColor.takeIf { it != null } ?: defaultPrimaryBtnBackgroundColor | ||
| val primaryBtnTextColor = config?.primaryBtnTextColor.takeIf { it != null } ?: defaultPrimaryBtnTextColor | ||
|
|
||
| val secondaryBtnBackgroundColor = config?.secondaryBtnBackgroundColor.takeIf { it != null } ?: defaultSecondaryBtnBackgroundColor | ||
| val secondaryBtnTextColor = config?.secondaryBtnTextColor.takeIf { it != null } ?: defaultSecondaryBtnTextColor | ||
|
|
||
| val titleTextColor = config?.titleTextColor.takeIf { it != null } ?: defaultTitleTextColor | ||
| val bodyTextColor = config?.bodyTextColor.takeIf { it != null } ?: defaultBodyTextColor | ||
|
|
||
| val gradientDrawable = GradientDrawable() | ||
|
|
||
| gradientDrawable.setColor(backgroundColor) | ||
| gradientDrawable.setStroke(borderWidth, borderColor) | ||
| gradientDrawable.cornerRadius = borderCornerRadius | ||
| view.setBackgroundDrawable(gradientDrawable) | ||
|
|
||
| val firstButton = view.findViewById<Button>(R.id.embedded_message_first_button) | ||
| val secondButton = view.findViewById<Button>(R.id.embedded_message_second_button) | ||
|
|
||
| val titleText = view.findViewById<TextView>(R.id.embedded_message_title) | ||
| val bodyText = view.findViewById<TextView>(R.id.embedded_message_body) | ||
|
|
||
| if(config?.primaryBtnBackgroundColor != null) { | ||
| val primaryBtnBackgroundDrawable = if(viewType == IterableEmbeddedViewType.NOTIFICATION) | ||
| ContextCompat.getDrawable(requireContext(), R.drawable.primary_notification_button_background) as? GradientDrawable | ||
| else ContextCompat.getDrawable(requireContext(), R.drawable.primary_banner_button_background) as? GradientDrawable | ||
| primaryBtnBackgroundDrawable?.setColor(primaryBtnBackgroundColor) | ||
|
|
||
| firstButton.setBackgroundDrawable(primaryBtnBackgroundDrawable) | ||
| } | ||
|
|
||
| if(config?.secondaryBtnBackgroundColor != null) { | ||
| val secondaryBtnBackgroundDrawable = if(viewType == IterableEmbeddedViewType.NOTIFICATION) | ||
| ContextCompat.getDrawable(requireContext(), R.drawable.secondary_notification_button_background) as? GradientDrawable | ||
| else ContextCompat.getDrawable(requireContext(), R.drawable.secondary_banner_button_background) as? GradientDrawable | ||
| secondaryBtnBackgroundDrawable?.setColor(secondaryBtnBackgroundColor) | ||
|
|
||
| secondButton.setBackgroundDrawable(secondaryBtnBackgroundDrawable) | ||
| } | ||
|
|
||
| firstButton.setTextColor(primaryBtnTextColor) | ||
| secondButton.setTextColor(secondaryBtnTextColor) | ||
|
|
||
| titleText.setTextColor(titleTextColor) | ||
| bodyText.setTextColor(bodyTextColor) | ||
| } | ||
|
|
||
| private fun bind(viewType: IterableEmbeddedViewType, view: View, message: IterableEmbeddedMessage): View { | ||
| val embeddedMessageViewTitle: TextView = view.findViewById(R.id.embedded_message_title) | ||
| val embeddedMessageViewBody: TextView = view.findViewById(R.id.embedded_message_body) | ||
| val embeddedMessageViewButton: Button = view.findViewById(R.id.embedded_message_first_button) | ||
| val embeddedMessageViewButton2: Button = view.findViewById(R.id.embedded_message_second_button) | ||
|
|
||
| if(viewType != IterableEmbeddedViewType.NOTIFICATION) { | ||
| val embeddedMessageImageView: ImageView = view.findViewById(R.id.embedded_message_image) | ||
|
|
||
| if(message.elements?.mediaURL?.isEmpty() == true) { | ||
| embeddedMessageImageView.visibility = View.GONE | ||
| } else { | ||
| Glide.with(view.context).load(message.elements?.mediaURL).into(embeddedMessageImageView) | ||
| embeddedMessageImageView.contentDescription = message.elements?.mediaUrlCaption | ||
| } | ||
| } | ||
|
|
||
| embeddedMessageViewTitle.text = message.elements?.title | ||
| embeddedMessageViewBody.text = message.elements?.body | ||
|
|
||
| val buttons = message.elements?.buttons | ||
|
|
||
| if (buttons != null) { | ||
| setButton(embeddedMessageViewButton, buttons.getOrNull(0), message) | ||
|
|
||
| if (buttons.size > 1) { | ||
| setButton(embeddedMessageViewButton2, buttons.getOrNull(1), message) | ||
| } else { | ||
| embeddedMessageViewButton2.visibility = View.GONE | ||
| } | ||
|
|
||
| } else { | ||
| embeddedMessageViewButton.visibility = View.GONE | ||
| embeddedMessageViewButton2.visibility = View.GONE | ||
| } | ||
|
|
||
| return view | ||
| } | ||
|
|
||
| private fun setDefaultAction(view: View, message: IterableEmbeddedMessage) { | ||
| if(message.elements?.defaultAction != null) { | ||
| val clickedUrl = message.elements?.defaultAction?.data.takeIf { it?.isNotEmpty() == true } ?: message.elements?.defaultAction?.type | ||
|
|
||
| view.setOnClickListener { | ||
| IterableApi.getInstance().embeddedManager.handleEmbeddedClick(message, null, clickedUrl) | ||
| IterableApi.getInstance().trackEmbeddedClick(message, null, clickedUrl) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun setButton(buttonView: Button, button: EmbeddedMessageElementsButton?, message: IterableEmbeddedMessage) { | ||
| buttonView.visibility = if (button?.title == null) View.GONE else View.VISIBLE | ||
| buttonView.text = button?.title.orEmpty() | ||
|
|
||
| val clickedUrl = if (button?.action?.data?.isNotEmpty() == true) button.action?.data else button?.action?.type | ||
|
|
||
| buttonView.setOnClickListener { | ||
| IterableApi.getInstance().embeddedManager.handleEmbeddedClick(message, button?.id, clickedUrl) | ||
| IterableApi.getInstance().trackEmbeddedClick(message, button?.id, clickedUrl) | ||
| } | ||
| } | ||
|
|
||
| private fun getDefaultColor(viewType: IterableEmbeddedViewType, notificationColor: Int, cardColor: Int, bannerColor: Int): Int { | ||
| return when (viewType) { | ||
| IterableEmbeddedViewType.NOTIFICATION -> ContextCompat.getColor(requireContext(), notificationColor) | ||
| IterableEmbeddedViewType.CARD -> ContextCompat.getColor(requireContext(), cardColor) | ||
| else -> ContextCompat.getColor(requireContext(), bannerColor) | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.iterable.iterableapi.ui.embedded | ||
|
|
||
| import android.graphics.Color | ||
|
|
||
| data class IterableEmbeddedViewConfig( | ||
| val backgroundColor: Int?, | ||
| val borderColor: Int?, | ||
| val borderWidth: Int?, | ||
| val borderCornerRadius: Float?, | ||
| val primaryBtnBackgroundColor: Int?, | ||
| val primaryBtnTextColor: Int?, | ||
| val secondaryBtnBackgroundColor: Int?, | ||
| val secondaryBtnTextColor: Int?, | ||
| val titleTextColor: Int?, | ||
| val bodyTextColor: Int? | ||
| ) |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package com.iterable.iterableapi.ui.embedded | ||
|
|
||
| public enum class IterableEmbeddedViewType { | ||
| BANNER, | ||
| CARD, | ||
| NOTIFICATION | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:shape="rectangle"> | ||
|
|
||
| <stroke | ||
| android:width="1dp" | ||
| android:color="@color/banner_border_color" /> | ||
|
|
||
| <solid android:color="@color/banner_background_color" /> | ||
|
|
||
| <corners | ||
| android:radius="8dp" /> | ||
| </shape> |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <shapeable | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:shape="rectangle"> | ||
| <solid android:color="#FFFFFF" /> | ||
| <corners | ||
| android:topLeftRadius="16dp" | ||
| android:topRightRadius="16dp" | ||
| android:bottomLeftRadius="0dp" | ||
| android:bottomRightRadius="0dp" | ||
| /> | ||
| </shapeable> |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:shape="rectangle"> | ||
|
|
||
| <stroke | ||
| android:width="1dp" | ||
| android:color="@color/notification_background_color" /> | ||
|
|
||
| <solid android:color="@color/notification_border_color" /> | ||
|
|
||
| <corners | ||
| android:radius="8dp" /> | ||
| </shape> |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:shape="rectangle"> | ||
|
|
||
| <solid android:color="@color/banner_button_color" /> | ||
|
|
||
| <corners | ||
| android:radius="32dp" /> | ||
| </shape> |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:shape="rectangle"> | ||
|
|
||
| <solid android:color="@color/white" /> | ||
|
|
||
| <stroke | ||
| android:width="1dp" | ||
| android:color="@color/white" /> | ||
|
|
||
| <corners | ||
| android:radius="32dp" /> | ||
| </shape> |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:shape="rectangle"> | ||
|
|
||
| <solid android:color="@color/white" /> | ||
|
|
||
| <stroke | ||
| android:width="1dp" | ||
| android:color="@color/notification_button_border_color" /> | ||
|
|
||
| <corners | ||
| android:radius="32dp" /> | ||
| </shape> |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Glide library can be discarded. Good that for now its in api-ui and not the api.