[Paywalls V2] Adds deserialization of TabsComponent

api-tester/src/main/java/com/revenuecat/apitester/java/PricingPhaseAPI.java

@@ -18,9 +18,11 @@ static void checkPricingPhase(PricingPhase pricingPhase) {
         Price price = pricingPhase.getPrice();
         String pricePerMonthString = pricingPhase.formattedPriceInMonths(locale);
         String pricePerMonthStringNoLocale = pricingPhase.formattedPriceInMonths();
+        Price pricePerDay = pricingPhase.pricePerDay(locale);
         Price pricePerWeek = pricingPhase.pricePerWeek(locale);
         Price pricePerMonth = pricingPhase.pricePerMonth(locale);
         Price pricePerYear = pricingPhase.pricePerYear(locale);
+        Price pricePerDayNoLocale = pricingPhase.pricePerDay();
         Price pricePerWeekNoLocale = pricingPhase.pricePerWeek();
         Price pricePerMonthNoLocale = pricingPhase.pricePerMonth();
         Price pricePerYearNoLocale = pricingPhase.pricePerYear();

api-tester/src/main/java/com/revenuecat/apitester/java/StoreProductAPI.java

@@ -30,6 +30,7 @@ static void check(final StoreProduct product) {
         final String description = product.getDescription();
         final Period period = product.getPeriod();
         final String formattedPricePerMonth = product.formattedPricePerMonth(locale);
+        final Price pricePerDay = product.pricePerDay(locale);
         final Price pricePerWeek = product.pricePerWeek(locale);
         final Price pricePerMonth = product.pricePerMonth(locale);
         final Price pricePerYear = product.pricePerYear(locale);

api-tester/src/main/java/com/revenuecat/apitester/kotlin/PricingPhaseAPI.kt

@@ -16,9 +16,11 @@ private class PricingPhaseAPI {
         val price: Price = pricingPhase.price
         val pricePerMonthString: String = pricingPhase.formattedPriceInMonths(locale)
         val pricePerMonthStringNoLocale: String = pricingPhase.formattedPriceInMonths()
+        val pricePerDay = pricingPhase.pricePerDay(locale)
         val pricePerWeek = pricingPhase.pricePerWeek(locale)
         val pricePerMonth = pricingPhase.pricePerMonth(locale)
         val pricePerYear = pricingPhase.pricePerYear(locale)
+        val pricePerDayNoLocale = pricingPhase.pricePerDay()
         val pricePerWeekNoLocale = pricingPhase.pricePerWeek()
         val pricePerMonthNoLocale = pricingPhase.pricePerMonth()
         val pricePerYearNoLocale = pricingPhase.pricePerYear()

api-tester/src/main/java/com/revenuecat/apitester/kotlin/StoreProductAPI.kt

@@ -26,6 +26,7 @@ private class StoreProductAPI {
             val price: Price = price
             val formattedPricePerMonth: String? = formattedPricePerMonth(locale)
             val formattedPricePerMonthNoLocale: String? = formattedPricePerMonth()
+            val pricePerDay: Price? = pricePerDay(locale)
             val pricePerWeek: Price? = pricePerWeek(locale)
             val pricePerMonth: Price? = pricePerMonth(locale)
             val pricePerYear: Price? = pricePerYear(locale)

purchases/src/main/kotlin/com/revenuecat/purchases/models/Period.kt

@@ -1,6 +1,7 @@
 package com.revenuecat.purchases.models
 
 import android.os.Parcelable
+import com.revenuecat.purchases.InternalRevenueCatAPI
 import com.revenuecat.purchases.common.errorLog
 import kotlinx.parcelize.Parcelize
 import kotlin.math.roundToInt
@@ -60,17 +61,31 @@ data class Period(
         UNKNOWN,
     }
 
+    @InternalRevenueCatAPI
+    val valueInDays: Double
+        get() = when (unit) {
+            Unit.DAY -> value.toDouble()
+            Unit.WEEK -> value * PeriodConstants.DAYS_PER_WEEK
+            Unit.MONTH -> value * PeriodConstants.DAYS_PER_MONTH
+            Unit.YEAR -> value * PeriodConstants.DAYS_PER_YEAR
+            Unit.UNKNOWN -> {
+                errorLog("Unknown period unit trying to get value in days: $unit")
+                0.0
+            }
+        }
+
     /**
      * The period value in week units. This is an approximated value.
      */
-    internal val valueInWeeks: Double
+    @InternalRevenueCatAPI
+    val valueInWeeks: Double
         get() = when (unit) {
             Unit.DAY -> value / PeriodConstants.DAYS_PER_WEEK
             Unit.WEEK -> value.toDouble()
             Unit.MONTH -> value.toDouble() * PeriodConstants.WEEKS_PER_MONTH
             Unit.YEAR -> value * PeriodConstants.WEEKS_PER_YEAR
             Unit.UNKNOWN -> {
-                errorLog("Unknown period unit trying to get value in months: $unit")
+                errorLog("Unknown period unit trying to get value in weeks: $unit")
                 0.0
             }
         }
@@ -93,14 +108,15 @@ data class Period(
     /**
      * The period value in week units. This is an approximated value.
      */
-    internal val valueInYears: Double
+    @InternalRevenueCatAPI
+    val valueInYears: Double
         get() = when (unit) {
             Unit.DAY -> value / PeriodConstants.DAYS_PER_YEAR
             Unit.WEEK -> value / PeriodConstants.WEEKS_PER_YEAR
             Unit.MONTH -> value / PeriodConstants.MONTHS_PER_YEAR
             Unit.YEAR -> value.toDouble()
             Unit.UNKNOWN -> {
-                errorLog("Unknown period unit trying to get value in months: $unit")
+                errorLog("Unknown period unit trying to get value in years: $unit")
                 0.0
             }
         }

purchases/src/main/kotlin/com/revenuecat/purchases/models/PricingPhase.kt

@@ -1,6 +1,7 @@
 package com.revenuecat.purchases.models
 
 import android.os.Parcelable
+import com.revenuecat.purchases.utils.pricePerDay
 import com.revenuecat.purchases.utils.pricePerMonth
 import com.revenuecat.purchases.utils.pricePerWeek
 import com.revenuecat.purchases.utils.pricePerYear
@@ -56,6 +57,16 @@ data class PricingPhase(
             }
         }
 
+    /**
+     * Gives the price of the [PricingPhase] in the given locale in a daily recurrence. This means that for example,
+     * if the period is weekly, the price will be divided by 7. It uses a currency formatter to format the price in
+     * the given locale. Note that this value may be an approximation.
+     * @param locale Locale to use for formatting the price. Default is the system default locale.
+     */
+    @JvmOverloads
+    fun pricePerDay(locale: Locale = Locale.getDefault()): Price =
+        price.pricePerDay(billingPeriod, locale)
+
     /**
      * Gives the price of the [PricingPhase] in the given locale in a weekly recurrence. This means that for example,
      * if the period is monthly, the price will be divided by 4. It uses a currency formatter to format the price in

purchases/src/main/kotlin/com/revenuecat/purchases/models/StoreProduct.kt

@@ -2,6 +2,7 @@ package com.revenuecat.purchases.models
 
 import com.revenuecat.purchases.PresentedOfferingContext
 import com.revenuecat.purchases.ProductType
+import com.revenuecat.purchases.utils.pricePerDay
 import com.revenuecat.purchases.utils.pricePerMonth
 import com.revenuecat.purchases.utils.pricePerWeek
 import com.revenuecat.purchases.utils.pricePerYear
@@ -134,6 +135,18 @@ interface StoreProduct {
      */
     fun copyWithPresentedOfferingContext(presentedOfferingContext: PresentedOfferingContext?): StoreProduct
 
+    /**
+     * Null for INAPP products. The price of the [StoreProduct] in the given locale in a daily recurrence.
+     * This means that, for example, if the period is weekly, the price will be divided by 7.
+     * It uses a currency formatter to format the price in the given locale.
+     * Note that this value may be an approximation.
+     * For Google subscriptions, this value will use the basePlan to calculate the value.
+     * @param locale Locale to use for formatting the price. Default is the system default locale.
+     */
+    fun pricePerDay(locale: Locale = Locale.getDefault()): Price? {
+        return period?.let { price.pricePerDay(it, locale) }
+    }
+
     /**
      * Null for INAPP products. The price of the [StoreProduct] in the given locale in a weekly recurrence.
      * This means that, for example, if the period is monthly, the price will be divided by 4.

purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/PaywallComponent.kt

@@ -46,6 +46,10 @@ internal class PaywallComponentSerializer : KSerializer<PaywallComponent> {
             "text" -> jsonDecoder.json.decodeFromString<TextComponent>(json.toString())
             "icon" -> jsonDecoder.json.decodeFromString<IconComponent>(json.toString())
             "timeline" -> jsonDecoder.json.decodeFromString<TimelineComponent>(json.toString())
+            "tab_control_button" -> jsonDecoder.json.decodeFromString<TabControlButtonComponent>(json.toString())
+            "tab_control_toggle" -> jsonDecoder.json.decodeFromString<TabControlToggleComponent>(json.toString())
+            "tab_control" -> jsonDecoder.json.decodeFromString<TabControlComponent>(json.toString())
+            "tabs" -> jsonDecoder.json.decodeFromString<TabsComponent>(json.toString())
             else -> json["fallback"]
                 ?.let { it as? JsonObject }
                 ?.toString()

purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/TabsComponent.kt

@@ -0,0 +1,131 @@
+@file:Suppress("LongParameterList")
+
+package com.revenuecat.purchases.paywalls.components
+
+import com.revenuecat.purchases.InternalRevenueCatAPI
+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.Padding
+import com.revenuecat.purchases.paywalls.components.properties.Shadow
+import com.revenuecat.purchases.paywalls.components.properties.Shape
+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
+
+@InternalRevenueCatAPI
+@Poko
+@Serializable
+@SerialName("tab_control_button")
+class TabControlButtonComponent(
+    @get:JvmSynthetic
+    @SerialName("tab_index")
+    val tabIndex: Int,
+    @get:JvmSynthetic
+    val stack: StackComponent,
+) : PaywallComponent
+
+@InternalRevenueCatAPI
+@Poko
+@Serializable
+@SerialName("tab_control_toggle")
+class TabControlToggleComponent(
+    @get:JvmSynthetic
+    @SerialName("default_value")
+    val defaultValue: Boolean,
+    @get:JvmSynthetic
+    @SerialName("thumb_color_on")
+    val thumbColorOn: ColorScheme,
+    @get:JvmSynthetic
+    @SerialName("thumb_color_off")
+    val thumbColorOff: ColorScheme,
+    @get:JvmSynthetic
+    @SerialName("track_color_on")
+    val trackColorOn: ColorScheme,
+    @get:JvmSynthetic
+    @SerialName("track_color_off")
+    val trackColorOff: ColorScheme,
+) : PaywallComponent
+
+@InternalRevenueCatAPI
+@Serializable
+@SerialName("tab_control")
+object TabControlComponent : PaywallComponent
+
+@InternalRevenueCatAPI
+@Poko
+@Serializable
+@SerialName("tabs")
+class TabsComponent(
+    @get:JvmSynthetic
+    val size: Size = Size(width = Fill, height = Fit),
+    @get:JvmSynthetic
+    val padding: Padding = Padding.zero,
+    @get:JvmSynthetic
+    val margin: Padding = Padding.zero,
+    @get:JvmSynthetic
+    @SerialName("background_color")
+    val backgroundColor: ColorScheme? = null,
+    @get:JvmSynthetic
+    val shape: Shape? = null,
+    @get:JvmSynthetic
+    val border: Border? = null,
+    @get:JvmSynthetic
+    val shadow: Shadow? = null,
+    @get:JvmSynthetic
+    val control: TabControl,
+    @get:JvmSynthetic
+    val tabs: List<Tab>,
+    @get:JvmSynthetic
+    val overrides: ComponentOverrides<PartialTabsComponent>? = null,
+) : PaywallComponent {
+    @InternalRevenueCatAPI
+    @Poko
+    @Serializable
+    class Tab(
+        @get:JvmSynthetic
+        val stack: StackComponent,
+    )
+
+    @InternalRevenueCatAPI
+    @Serializable
+    sealed interface TabControl {
+        @InternalRevenueCatAPI
+        @Poko
+        @Serializable
+        @SerialName("buttons")
+        class Buttons(@get:JvmSynthetic val stack: StackComponent) : TabControl
+
+        @InternalRevenueCatAPI
+        @Poko
+        @Serializable
+        @SerialName("toggle")
+        class Toggle(@get:JvmSynthetic val stack: StackComponent) : TabControl
+    }
+}
+
+@InternalRevenueCatAPI
+@Poko
+@Serializable
+class PartialTabsComponent(
+    @get:JvmSynthetic
+    val visible: Boolean? = true,
+    @get:JvmSynthetic
+    val size: Size? = null,
+    @get:JvmSynthetic
+    val padding: Padding? = null,
+    @get:JvmSynthetic
+    val margin: Padding? = null,
+    @get:JvmSynthetic
+    @SerialName("background_color")
+    val backgroundColor: ColorScheme? = null,
+    @get:JvmSynthetic
+    val shape: Shape? = null,
+    @get:JvmSynthetic
+    val border: Border? = null,
+    @get:JvmSynthetic
+    val shadow: Shadow? = null,
+) : PartialComponent

purchases/src/main/kotlin/com/revenuecat/purchases/utils/PriceExtensions.kt

@@ -1,5 +1,6 @@
 package com.revenuecat.purchases.utils
 
+import com.revenuecat.purchases.InternalRevenueCatAPI
 import com.revenuecat.purchases.models.Period
 import com.revenuecat.purchases.models.Price
 import java.text.NumberFormat
@@ -8,6 +9,13 @@ import java.util.Locale
 
 private const val MICRO_MULTIPLIER = 1_000_000.0
 
+@JvmSynthetic
+@OptIn(InternalRevenueCatAPI::class)
+internal fun Price.pricePerDay(billingPeriod: Period, locale: Locale): Price {
+    return pricePerPeriod(billingPeriod.valueInDays, locale)
+}
+
+@OptIn(InternalRevenueCatAPI::class)
 internal fun Price.pricePerWeek(billingPeriod: Period, locale: Locale): Price {
     return pricePerPeriod(billingPeriod.valueInWeeks, locale)
 }
@@ -16,6 +24,7 @@ internal fun Price.pricePerMonth(billingPeriod: Period, locale: Locale): Price {
     return pricePerPeriod(billingPeriod.valueInMonths, locale)
 }
 
+@OptIn(InternalRevenueCatAPI::class)
 internal fun Price.pricePerYear(billingPeriod: Period, locale: Locale): Price {
     return pricePerPeriod(billingPeriod.valueInYears, locale)
 }