Update Custom Entitlements Sample app by aboedo · Pull Request #1166 · RevenueCat/purchases-android

aboedo · 2023-07-21T20:32:59Z

Adds quite a few things to the Custom Entitlements Sample app:

A tutorial mode that when tapped, provides an explanation for what the mode does
Displays the current app user ID at all times
Moved the customer info JSON into its own view, such that the main view shows a list of all the values that have been fired from the listener

aboedo · 2023-07-21T20:33:22Z

+    implementation platform('androidx.compose:compose-bom:2022.10.00')
+    implementation 'androidx.compose.ui:ui-tooling-preview'
+    androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'


lol what

Android studio's auto suggestions are bonkers, reverting this bit

aboedo · 2023-07-21T20:33:41Z

+        <activity
+            android:name=".main.ExplanationScreen"
+            android:exported="false"
+            android:label="@string/title_activity_explanation_screen"
+            android:theme="@style/Theme.CustomEntitlementComputationSample" />


also an accident, reverting this bit

aboedo · 2023-07-21T20:33:55Z

+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CustomerInfoDetailScreen(event: CustomerInfoEvent) {


shows the customer info as JSON

aboedo · 2023-07-21T20:34:09Z

+}
+
+@Composable
+fun CustomerInfoEventsListItem(event: CustomerInfoEvent, onEventClicked: (CustomerInfoEvent) -> Unit) {


shows a list of all customer info values that have been fired from the delegate

aboedo · 2023-07-21T20:34:22Z

+import com.revenuecat.sample.ui.theme.CustomEntitlementComputationTheme
+
+@Composable
+fun ExplanationScreen(onDismiss: () -> Unit) {


shows an explanation for what this mode is

aboedo · 2023-07-21T20:34:43Z

+    val navController = rememberNavController()
+    NavHost(navController, startDestination = "main") {
+        composable("main") { MainScreen(navController = navController) }
+        composable("customerInfoDetails/{date}") { backStackEntry ->
+            CustomerInfoDetailScreen(event = uiState.value.customerInfoList.find {
+                it.date.toString() == backStackEntry.arguments?.getString("date")
+            }!!)
+        }
+    }
+}


nav controller here is useful for being able to navigate in and out of customer info details

aboedo · 2023-07-21T20:35:20Z


 @OptIn(ExperimentalPreviewRevenueCatPurchasesAPI::class)
 class MainViewModel : ViewModel() {
+    private val previewMode = false // change this to true to be able to preview in Android Studio


otherwise, when we init using methods from Purchases, the preview crashes

Right... I guess alternative we could move that code to an initialize method or setUpListener... But we can go with this for now.

aboedo · 2023-07-21T20:35:32Z

@@ -1,3 +1,4 @@
 <resources>
    <string name="app_name">CustomEntitlementComputationSample</string>
+    <string name="title_activity_explanation_screen">ExplanationScreen</string>


another one to revert

…he same one that the view was using

aboedo · 2023-07-21T20:58:39Z

+                        Text(
+                            text = "Tap here for more details about this mode.",
+                            modifier = Modifier
+                                .padding(16.dp),
+                            textAlign = TextAlign.Center,
+                            fontWeight = FontWeight.Bold,


I tried like 15 things to center the text here but Compose didn't want it centered ¯_(ツ)_/¯

Hmm I see these Text are under a Column. Not sure if you tried Column(modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally ) or something like that?

codecov · 2023-07-21T21:09:42Z

Codecov Report

Merging #1166 (231a608) into main (84685a0) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1166   +/-   ##
=======================================
  Coverage   85.59%   85.59%           
=======================================
  Files         179      179           
  Lines        6121     6121           
  Branches      918      918           
=======================================
  Hits         5239     5239           
  Misses        540      540           
  Partials      342      342

joshdholtz

All looks good to me 😇

tonidero

Left a few comments but nothing blocking. Looks good!

tonidero · 2023-07-24T07:43:36Z

+                        Text(
+                            text = "Tap here for more details about this mode.",
+                            modifier = Modifier
+                                .padding(16.dp),
+                            textAlign = TextAlign.Center,
+                            fontWeight = FontWeight.Bold,


Hmm I see these Text are under a Column. Not sure if you tried Column(modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally ) or something like that?

tonidero · 2023-07-24T07:44:54Z


 @Composable
-fun MainScreen() {
+fun MainScreenNavigation() {


Nitpick, but would be worth extracting the navigation to its own file.

tonidero · 2023-07-24T07:45:29Z

    val shouldShowSwitchingUserDialog: Boolean = false,
+    val shouldShowExplanationDialog: Boolean = false,
    val offerings: Offerings? = null,
+    val currentAppUserID: String = Constants.defaultAppUserID,


Should we make it nullable here, so we make sure the user id comes from RC?

tonidero · 2023-07-24T07:46:46Z


 @OptIn(ExperimentalPreviewRevenueCatPurchasesAPI::class)
 class MainViewModel : ViewModel() {
+    private val previewMode = false // change this to true to be able to preview in Android Studio


Right... I guess alternative we could move that code to an initialize method or setUpListener... But we can go with this for now.

tonidero · 2023-07-24T07:47:29Z


    fun switchUser(newUserID: String) {
        Purchases.sharedInstance.switchUser(newUserID)
+        _uiState.update { it.copy(currentAppUserID = newUserID) }


Just to help debugging, should we update it to Purchases.sharedInstance.appUserID here instead?

tonidero · 2023-07-24T07:55:33Z

@@ -86,6 +92,23 @@ class MainViewModel : ViewModel() {
    }

    private fun updateCustomerInfoInformation(customerInfo: CustomerInfo) {


FFTI. This could be renamed to updateUIState

@aboedo

**This is an automatic release.** ### New Features Introduced Custom Entitlements Computation mode. This is new library intended for apps that will do their own entitlement computation separate from RevenueCat. It's distributed as a separate artifact in Maven. Apps using this mode rely on webhooks to signal their backends to refresh entitlements with RevenueCat. See the [demo app for an example and usage instructions](https://github.com/RevenueCat/purchases-android/tree/main/examples/CustomEntitlementComputationSample). * Custom entitlements: add README and other improvements (#1167) via Andy Boedo (@aboedo) * Update Custom Entitlements Sample app (#1166) via Andy Boedo (@aboedo) * purchase coroutine (#1142) via Andy Boedo (@aboedo) * Add switchUser (#1156) via Cesar de la Vega (@vegaro) * CustomEntitlementsComputation: disable first listener callback when set (#1152) via Andy Boedo (@aboedo) * CustomEntitlementsComputation: Prevent posting subscriber attributes in post receipt (#1151) via Andy Boedo (@aboedo) * Fix `customEntitlementComputation` library deployment (#1169) via Toni Rico (@tonidero) * CustomEntitlementComputation: Configure method for customEntitlementComputation mode (#1168) via Toni Rico (@tonidero) * Add publish system for customEntitlementComputation package (#1149) via Cesar de la Vega (@vegaro) * Use purchase coroutine in CustomEntitlementComputationSample (#1162) via Cesar de la Vega (@vegaro) * Adds CustomEntitlementComputationSample (#1160) via Cesar de la Vega (@vegaro) * Fix tests in customEntitlementComputation after merges (#1161) via Toni Rico (@tonidero) * CustomEntitlementComputation: Remove custom entitlement computation flavor for amazon module (#1158) via Toni Rico (@tonidero) * CustomEntitlementComputation: Generate dokka docs only for defaults flavor (#1159) via Toni Rico (@tonidero) * CustomEntitlementComputation: Create different PurchasesConfiguration that requires an appUserId parameter (#1154) via Toni Rico (@tonidero) * CustomEntitlementComputation: New Purchases class (#1153) via Toni Rico (@tonidero) * CustomEntitlementComputation: Disable automatic cache refresh (#1157) via Toni Rico (@tonidero) * Add `customEntitlementComputation` flavor (#1147) via Toni Rico (@tonidero) * Make `customEntitlementComputation` singular (#1148) via Toni Rico (@tonidero) * Disable offline entitlements in custom entitlements computation mode (#1146) via Toni Rico (@tonidero) * Remove integration test flavor (#1143) via Toni Rico (@tonidero) * Add header to requests when in custom entitlement computation mode (#1145) via Toni Rico (@tonidero) * Add internal customEntitlementsComputation mode to app config (#1141) via Toni Rico (@tonidero) ### New Coroutines * `awaitPurchase` is available as a coroutine-friendly alternative to `purchase()`. (#1142) via Andy Boedo (@aboedo) ### Dependency Updates * Bump fastlane from 2.213.0 to 2.214.0 (#1140) via dependabot[bot] (@dependabot[bot]) ### Other changes * CI: make all Codecov jobs informational (#1155) via Cesar de la Vega (@vegaro) * Creates PurchasesOrchestrator (#1144) via Cesar de la Vega (@vegaro) --------- Co-authored-by: revenuecat-ops <ops@revenuecat.com> Co-authored-by: Andy Boedo <andresboedo@gmail.com>

@aboedo

### New Features Introduced Custom Entitlements Computation mode. This is new library intended for apps that will do their own entitlement computation separate from RevenueCat. It's distributed as a separate artifact in Maven. Apps using this mode rely on webhooks to signal their backends to refresh entitlements with RevenueCat. See the [demo app for an example and usage instructions](https://github.com/RevenueCat/purchases-android/tree/main/examples/CustomEntitlementComputationSample). * Custom entitlements: add README and other improvements (#1167) via Andy Boedo (@aboedo) * Update Custom Entitlements Sample app (#1166) via Andy Boedo (@aboedo) * purchase coroutine (#1142) via Andy Boedo (@aboedo) * Add switchUser (#1156) via Cesar de la Vega (@vegaro) * CustomEntitlementsComputation: disable first listener callback when set (#1152) via Andy Boedo (@aboedo) * CustomEntitlementsComputation: Prevent posting subscriber attributes in post receipt (#1151) via Andy Boedo (@aboedo) * Fix `customEntitlementComputation` library deployment (#1169) via Toni Rico (@tonidero) * CustomEntitlementComputation: Configure method for customEntitlementComputation mode (#1168) via Toni Rico (@tonidero) * Add publish system for customEntitlementComputation package (#1149) via Cesar de la Vega (@vegaro) * Use purchase coroutine in CustomEntitlementComputationSample (#1162) via Cesar de la Vega (@vegaro) * Adds CustomEntitlementComputationSample (#1160) via Cesar de la Vega (@vegaro) * Fix tests in customEntitlementComputation after merges (#1161) via Toni Rico (@tonidero) * CustomEntitlementComputation: Remove custom entitlement computation flavor for amazon module (#1158) via Toni Rico (@tonidero) * CustomEntitlementComputation: Generate dokka docs only for defaults flavor (#1159) via Toni Rico (@tonidero) * CustomEntitlementComputation: Create different PurchasesConfiguration that requires an appUserId parameter (#1154) via Toni Rico (@tonidero) * CustomEntitlementComputation: New Purchases class (#1153) via Toni Rico (@tonidero) * CustomEntitlementComputation: Disable automatic cache refresh (#1157) via Toni Rico (@tonidero) * Add `customEntitlementComputation` flavor (#1147) via Toni Rico (@tonidero) * Make `customEntitlementComputation` singular (#1148) via Toni Rico (@tonidero) * Disable offline entitlements in custom entitlements computation mode (#1146) via Toni Rico (@tonidero) * Remove integration test flavor (#1143) via Toni Rico (@tonidero) * Add header to requests when in custom entitlement computation mode (#1145) via Toni Rico (@tonidero) * Add internal customEntitlementsComputation mode to app config (#1141) via Toni Rico (@tonidero) ### New Coroutines * `awaitPurchase` is available as a coroutine-friendly alternative to `purchase()`. (#1142) via Andy Boedo (@aboedo) ### Dependency Updates * Bump fastlane from 2.213.0 to 2.214.0 (#1140) via dependabot[bot] (@dependabot[bot]) ### Other changes * CI: make all Codecov jobs informational (#1155) via Cesar de la Vega (@vegaro) * Creates PurchasesOrchestrator (#1144) via Cesar de la Vega (@vegaro) --------- Co-authored-by: revenuecat-ops <ops@revenuecat.com> Co-authored-by: Andy Boedo <andresboedo@gmail.com>

aboedo added 7 commits July 21, 2023 15:29

added some more labels

189b98c

added explanation dialog

0e13222

wired in current app user id

7eea2c7

added a new view type for the customer info event list

7378a74

added navigation to customer info details screen

66215b5

updated so that the values display after the buttons and not before

d13ef6a

remove unused imports

9d85759

aboedo self-assigned this Jul 21, 2023

aboedo commented Jul 21, 2023

View reviewed changes

aboedo added 4 commits July 21, 2023 17:36

revert unnecessary extra libraries

c236eff

reverted other useless changes

151be1a

updated to use UUIDs instead of date for events

661a835

fixed navigation bug where the viewModel used for navigation wasn't t…

231a608

…he same one that the view was using

aboedo added the pr:feat A new feature label Jul 21, 2023

aboedo marked this pull request as ready for review July 21, 2023 20:57

aboedo requested review from a team and joshdholtz July 21, 2023 20:57

aboedo commented Jul 21, 2023

View reviewed changes

joshdholtz approved these changes Jul 21, 2023

View reviewed changes

aboedo merged commit 3a43a81 into main Jul 21, 2023

aboedo deleted the andy/sdk-3239-create-lazycolumn-with-stream-of-customerinfo-updates branch July 21, 2023 21:40

tonidero reviewed Jul 24, 2023

View reviewed changes

RCGitBot mentioned this pull request Jul 24, 2023

[AUTOMATIC] Release/6.8.0 #1170

Merged

RCGitBot mentioned this pull request Jul 24, 2023

[AUTOMATIC] Release/6.8.0 #1173

Merged

		@@ -86,6 +92,23 @@ class MainViewModel : ViewModel() {
		}

		private fun updateCustomerInfoInformation(customerInfo: CustomerInfo) {

Uh oh!

Conversation

aboedo commented Jul 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented Jul 21, 2023

Codecov Report

Uh oh!

joshdholtz left a comment

Choose a reason for hiding this comment

Uh oh!

tonidero left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

aboedo commented Jul 21, 2023 •

edited

Loading