Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Paywalls V2] Add IconComponent #2071

Merged
merged 4 commits into from
Jan 22, 2025
Merged

[Paywalls V2] Add IconComponent #2071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d8cd50
[Paywalls V2] Add IconComponent
tonidero Jan 20, 2025
c899421
Add support for solid tint colors
tonidero Jan 21, 2025
74cf874
Add tests and fix nullability
tonidero Jan 21, 2025
a030953
Fixes after rebase
tonidero Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 96 additions & 0 deletions purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/IconComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
package com.revenuecat.purchases.paywalls.components

import com.revenuecat.purchases.InternalRevenueCatAPI
import com.revenuecat.purchases.paywalls.components.IconComponent.Formats
import com.revenuecat.purchases.paywalls.components.IconComponent.IconBackground
import com.revenuecat.purchases.paywalls.components.common.ComponentOverrides
import com.revenuecat.purchases.paywalls.components.properties.Border
import com.revenuecat.purchases.paywalls.components.properties.ColorScheme
import com.revenuecat.purchases.paywalls.components.properties.MaskShape
import com.revenuecat.purchases.paywalls.components.properties.Padding
import com.revenuecat.purchases.paywalls.components.properties.Padding.Companion.zero
import com.revenuecat.purchases.paywalls.components.properties.Shadow
import com.revenuecat.purchases.paywalls.components.properties.Size
import com.revenuecat.purchases.paywalls.components.properties.SizeConstraint.Fill
import com.revenuecat.purchases.paywalls.components.properties.SizeConstraint.Fit
import dev.drewhamilton.poko.Poko
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable

@Suppress("LongParameterList")
@InternalRevenueCatAPI
@Poko
@Serializable
@SerialName("icon")
class IconComponent(
@get:JvmSynthetic
@SerialName("base_url")
val baseUrl: String,
@get:JvmSynthetic
@SerialName("icon_name")
val iconName: String,
@get:JvmSynthetic
val formats: Formats,
@get:JvmSynthetic
val size: Size = Size(width = Fill, height = Fit),
@get:JvmSynthetic
val color: ColorScheme? = null,
@get:JvmSynthetic
val padding: Padding = zero,
@get:JvmSynthetic
val margin: Padding = zero,
@get:JvmSynthetic
@SerialName("icon_background")
val iconBackground: IconBackground? = null,
@get:JvmSynthetic
val overrides: ComponentOverrides<PartialIconComponent>? = null,
) : PaywallComponent {

@Poko
@Serializable
class Formats(
@get:JvmSynthetic
val webp: String,
)

@Poko
@Serializable
class IconBackground(
@get:JvmSynthetic
val color: ColorScheme,
@get:JvmSynthetic
val shape: MaskShape,
@get:JvmSynthetic
val border: Border? = null,
@get:JvmSynthetic
val shadow: Shadow? = null,
)
}

@Suppress("LongParameterList")
@InternalRevenueCatAPI
@Poko
@Serializable
class PartialIconComponent(
@get:JvmSynthetic
val visible: Boolean? = true,
@get:JvmSynthetic
@SerialName("base_url")
val baseUrl: String? = null,
@get:JvmSynthetic
@SerialName("icon_name")
val iconName: String? = null,
@get:JvmSynthetic
val formats: Formats? = null,
@get:JvmSynthetic
val size: Size? = null,
@get:JvmSynthetic
val color: ColorScheme? = null,
@get:JvmSynthetic
val padding: Padding? = null,
@get:JvmSynthetic
val margin: Padding? = null,
@get:JvmSynthetic
@SerialName("icon_background")
val iconBackground: IconBackground? = null,
) : PartialComponent
1 change: 1 addition & 0 deletions purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/PaywallComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ internal class PaywallComponentSerializer : KSerializer<PaywallComponent> {
"stack" -> jsonDecoder.json.decodeFromString<StackComponent>(json.toString())
"sticky_footer" -> jsonDecoder.json.decodeFromString<StickyFooterComponent>(json.toString())
"text" -> jsonDecoder.json.decodeFromString<TextComponent>(json.toString())
"icon" -> jsonDecoder.json.decodeFromString<IconComponent>(json.toString())
else -> json["fallback"]
?.let { it as? JsonObject }
?.toString()
Expand Down
Loading