Merge pull request #10 from RevenueCat/feature/entitlements

Implement checking the entitlement

Author: skydoves

core/data/src/main/kotlin/com/revenuecat/articles/paywall/coredata/repository/DetailsRepository.kt

@@ -15,11 +15,14 @@
  */
 package com.revenuecat.articles.paywall.coredata.repository
 
+import com.revenuecat.purchases.CustomerInfo
 import com.revenuecat.purchases.Offering
 import com.skydoves.sandwich.ApiResponse
 import kotlinx.coroutines.flow.Flow
 
 interface DetailsRepository {
 
   fun fetchOffering(): Flow<ApiResponse<Offering>>
+
+  fun fetchCustomerInfo(): Flow<CustomerInfo?>
 }

core/data/src/main/kotlin/com/revenuecat/articles/paywall/coredata/repository/DetailsRepositoryImpl.kt

@@ -17,9 +17,11 @@ package com.revenuecat.articles.paywall.coredata.repository
 
 import com.revenuecat.articles.paywall.core.network.CatArticlesDispatchers
 import com.revenuecat.articles.paywall.core.network.Dispatcher
+import com.revenuecat.purchases.CustomerInfo
 import com.revenuecat.purchases.Offering
 import com.revenuecat.purchases.Purchases
 import com.revenuecat.purchases.PurchasesException
+import com.revenuecat.purchases.awaitCustomerInfo
 import com.revenuecat.purchases.awaitOfferings
 import com.skydoves.sandwich.ApiResponse
 import kotlinx.coroutines.CoroutineDispatcher
@@ -43,4 +45,13 @@ internal class DetailsRepositoryImpl @Inject constructor(
       ApiResponse.exception(e)
     }
   }.flowOn(ioDispatcher)
+
+  override fun fetchCustomerInfo(): Flow<CustomerInfo?> = flow {
+    try {
+      val customerInfo = Purchases.sharedInstance.awaitCustomerInfo()
+      emit(customerInfo)
+    } catch (e: PurchasesException) {
+      emit(null)
+    }
+  }
 }

core/designsystem/src/main/kotlin/com/revenuecat/articles/paywall/core/designsystem/component/FadeEdge.kt

@@ -24,11 +24,16 @@ import androidx.compose.ui.graphics.CompositingStrategy
 import androidx.compose.ui.graphics.graphicsLayer
 
 fun Modifier.fadingEdge(
+  isEnabled: Boolean = true,
   brush: Brush =
     Brush.verticalGradient(0.45f to Color.Red, 1f to Color.Transparent),
-) = this
-  .graphicsLayer(compositingStrategy = CompositingStrategy.Offscreen)
-  .drawWithContent {
-    drawContent()
-    drawRect(brush = brush, blendMode = BlendMode.DstIn)
-  }
+) = if (isEnabled) {
+  this
+    .graphicsLayer(compositingStrategy = CompositingStrategy.Offscreen)
+    .drawWithContent {
+      drawContent()
+      drawRect(brush = brush, blendMode = BlendMode.DstIn)
+    }
+} else {
+  this
+}

core/designsystem/src/main/res/values/strings.xml

@@ -19,4 +19,5 @@
   <string name="paywall_title">Read best articles from industry leaders by subscribing Cat Articles 😻</string>
   <string name="paywall_description">This article is available to members only. \nUnlock it to access exclusive member benefits.</string>
   <string name="paywall_cta">Join Cat Articles</string>
+  <string name="entitlement_premium">premium</string>
 </resources>

feature/article/src/main/kotlin/com/revenuecat/articles/paywal/feature/article/CatArticlesDetail.kt

@@ -70,6 +70,7 @@ import com.revenuecat.articles.paywall.core.designsystem.theme.CatArticlesTheme
 import com.revenuecat.articles.paywall.core.model.Article
 import com.revenuecat.articles.paywall.core.model.MockUtils.mockArticle
 import com.revenuecat.articles.paywall.core.navigation.boundsTransform
+import com.revenuecat.purchases.CustomerInfo
 import com.revenuecat.purchases.InternalRevenueCatAPI
 import com.revenuecat.purchases.Offering
 import com.revenuecat.purchases.ui.revenuecatui.PaywallDialog
@@ -89,6 +90,7 @@ fun SharedTransitionScope.CatArticlesDetail(
   viewModel: CatArticlesDetailViewModel = hiltViewModel(),
 ) {
   val article by viewModel.article.collectAsStateWithLifecycle()
+  val customerInfo by viewModel.customerInfo.collectAsStateWithLifecycle()
   val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
   Column(
@@ -105,6 +107,7 @@ fun SharedTransitionScope.CatArticlesDetail(
       CatArticlesDetailContent(
         article = article!!,
         uiState = uiState,
+        customerInfo = customerInfo,
         animatedVisibilityScope = animatedVisibilityScope,
         navigateUp = { viewModel.navigateUp() },
       )
@@ -116,14 +119,17 @@ fun SharedTransitionScope.CatArticlesDetail(
 private fun SharedTransitionScope.CatArticlesDetailContent(
   article: Article,
   uiState: DetailUiState,
+  customerInfo: CustomerInfo?,
   animatedVisibilityScope: AnimatedVisibilityScope,
   navigateUp: () -> Unit,
 ) {
   var palette by rememberPaletteState()
   val backgroundBrush by palette.paletteBackgroundBrush()
 
   val context = LocalContext.current
-  var isVisiblePaywallDialog by remember { mutableStateOf(false) }
+  val entitlementIdentifier = stringResource(R.string.entitlement_premium)
+  val isEntitled = customerInfo?.entitlements[entitlementIdentifier]?.isActive == true
+  var isVisiblePaywallDialog by remember(customerInfo) { mutableStateOf(false) }
 
   DetailsAppBar(
     article = article,
@@ -139,6 +145,7 @@ private fun SharedTransitionScope.CatArticlesDetailContent(
 
   DetailsContent(
     article = article,
+    isEntitled = isEntitled,
     onJoinClicked = {
       if (uiState is DetailUiState.Success) {
         isVisiblePaywallDialog = true
@@ -148,7 +155,7 @@ private fun SharedTransitionScope.CatArticlesDetailContent(
     },
   )
 
-  if (isVisiblePaywallDialog) {
+  if (isVisiblePaywallDialog && !isEntitled) {
     val offering = (uiState as? DetailUiState.Success)?.offering ?: return
     PaywallDialog(
       PaywallDialogOptions.Builder()
@@ -236,13 +243,14 @@ private fun SharedTransitionScope.DetailsHeader(
 @Composable
 private fun DetailsContent(
   article: Article,
+  isEntitled: Boolean,
   onJoinClicked: () -> Unit,
 ) {
   Column(
     modifier = Modifier
       .fillMaxSize()
       .padding(12.dp)
-      .fadingEdge(),
+      .fadingEdge(isEnabled = !isEntitled),
   ) {
     Text(
       text = article.title,
@@ -326,6 +334,7 @@ private fun CatArticlesDetailContentPreview() {
                 availablePackages = listOf(),
               ),
             ),
+            customerInfo = null,
             animatedVisibilityScope = this@AnimatedVisibility,
             navigateUp = {},
           )

feature/article/src/main/kotlin/com/revenuecat/articles/paywal/feature/article/CatArticlesDetailViewModel.kt

@@ -41,6 +41,12 @@ class CatArticlesDetailViewModel @Inject constructor(
 
   val article = savedStateHandle.getStateFlow<Article?>("article", null)
 
+  val customerInfo = repository.fetchCustomerInfo().stateIn(
+    scope = viewModelScope,
+    started = SharingStarted.WhileSubscribed(5000),
+    initialValue = null,
+  )
+
   val uiState: StateFlow<DetailUiState> = repository.fetchOffering()
     .mapLatest { response ->
       response.fold(