PR feedback from #9287

stripe · Oct 18, 2024 · 14dd986 · 14dd986
1 parent 50a5783
commit 14dd986
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 46 deletions.
diff --git a/connect-example/build.gradle b/connect-example/build.gradle
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 apply from: configs.androidApplication
 
 apply plugin: 'com.google.devtools.ksp'
@@ -126,6 +128,8 @@ android {
         freeCompilerArgs += [
                 "-opt-in=kotlinx.coroutines.FlowPreview",
                 "-Xcontext-receivers",
+                "-P",
+                "plugin:androidx.compose.compiler.plugins.kotlin:enableStrongSkippingMode=true"
         ]
         if (gradle.ext.isCi) {
             kotlinOptions.allWarningsAsErrors = true

diff --git a/...rc/main/java/com/stripe/android/connectsdk/example/networking/EmbeddedComponentService.kt b/...rc/main/java/com/stripe/android/connectsdk/example/networking/EmbeddedComponentService.kt
@@ -51,35 +51,12 @@ class EmbeddedComponentService {
     }
 }
 
-@Serializable
-data class FetchClientSecretResponse(
-    @SerialName("client_secret")
-    val clientSecret: String
-)
-
-@Serializable
-data class GetAccountsResponse(
-    @SerialName("publishable_key")
-    val publishableKey: String,
-    @SerialName("available_merchants")
-    val availableMerchants: List<Merchant>
-)
-
-@Serializable
-data class Merchant(
-    @SerialName("merchant_id")
-    val merchantId: String,
-    @SerialName("display_name")
-    val displayName: String
-)
-
 suspend fun <T : Any> Request.awaitModel(
     serializer: DeserializationStrategy<T>
 ): Result<T, FuelError> {
     val deserializer = object : Deserializable<T> {
 
         override fun deserialize(response: Response): T {
-            println(response.toString())
             val body = response.body().asString("application/json")
             return Json.decodeFromString(serializer, body)
         }

diff --git a/...c/main/java/com/stripe/android/connectsdk/example/networking/FetchClientSecretResponse.kt b/...c/main/java/com/stripe/android/connectsdk/example/networking/FetchClientSecretResponse.kt
@@ -0,0 +1,10 @@
+package com.stripe.android.connectsdk.example.networking
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FetchClientSecretResponse(
+    @SerialName("client_secret")
+    val clientSecret: String
+)
diff --git a/...ple/src/main/java/com/stripe/android/connectsdk/example/networking/GetAccountsResponse.kt b/...ple/src/main/java/com/stripe/android/connectsdk/example/networking/GetAccountsResponse.kt
@@ -0,0 +1,12 @@
+package com.stripe.android.connectsdk.example.networking
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GetAccountsResponse(
+    @SerialName("publishable_key")
+    val publishableKey: String,
+    @SerialName("available_merchants")
+    val availableMerchants: List<Merchant>
+)
diff --git a/connect-example/src/main/java/com/stripe/android/connectsdk/example/networking/Merchant.kt b/connect-example/src/main/java/com/stripe/android/connectsdk/example/networking/Merchant.kt
@@ -0,0 +1,12 @@
+package com.stripe.android.connectsdk.example.networking
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Merchant(
+    @SerialName("merchant_id")
+    val merchantId: String,
+    @SerialName("display_name")
+    val displayName: String
+)
diff --git a/.../src/main/java/com/stripe/android/connectsdk/example/networking/NetworkingInterceptors.kt b/.../src/main/java/com/stripe/android/connectsdk/example/networking/NetworkingInterceptors.kt
@@ -19,20 +19,21 @@ object ApplicationJsonHeaderInterceptor : FoldableRequestInterceptor {
 }
 
 object UserAgentHeader : FoldableRequestInterceptor {
-    private fun getUserAgent(): String {
-        val androidBrand = Build.BRAND
-        val androidDevice = Build.MODEL
-        val osVersion = Build.VERSION.SDK_INT
-        return buildString {
-            append("Stripe/ConnectSDKExample")
-            append(" (Android $androidBrand $androidDevice; (OS Version $osVersion))+")
-            append(" Version/${StripeSdkVersion.VERSION_NAME}")
+    private val userAgent: String
+        get() {
+            val androidBrand = Build.BRAND
+            val androidDevice = Build.MODEL
+            val osVersion = Build.VERSION.SDK_INT
+            return buildString {
+                append("Stripe/ConnectSDKExample")
+                append(" (Android $androidBrand $androidDevice; (OS Version $osVersion))+")
+                append(" Version/${StripeSdkVersion.VERSION_NAME}")
+            }
         }
-    }
 
     override fun invoke(next: RequestTransformer): RequestTransformer {
         return { request ->
-            next(request.header("User-Agent", getUserAgent()))
+            next(request.header("User-Agent", userAgent))
         }
     }
 }

diff --git a/...ple/src/main/java/com/stripe/android/connectsdk/example/ui/common/EmbeddedComponentsUi.kt b/...ple/src/main/java/com/stripe/android/connectsdk/example/ui/common/EmbeddedComponentsUi.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.unit.dp
 import com.stripe.android.connectsdk.example.networking.Merchant
 
 @Composable
-fun LaunchEmbeddedComponentsScreen(
+fun EmbeddedComponentsLauncherScreen(
     embeddedComponentName: String,
     selectedAccount: Merchant?,
     connectSDKAccounts: List<Merchant>,
@@ -59,7 +59,7 @@ fun LaunchEmbeddedComponentsScreen(
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun AccountSelector(
-    selectedAccount: Merchant? = null,
+    selectedAccount: Merchant?,
     accounts: List<Merchant>,
     onAccountSelected: (Merchant) -> Unit,
 ) {
@@ -87,7 +87,7 @@ fun AccountSelector(
                         expanded = false
                     }
                 ) {
-                    Text(text = account.displayName,)
+                    Text(text = account.displayName)
                 }
             }
         }
@@ -96,8 +96,8 @@ fun AccountSelector(
 
 @Preview(showBackground = true)
 @Composable
-fun LaunchEmbeddedComponentsScreenPreviewWithSelectedAccount() {
-    LaunchEmbeddedComponentsScreen(
+private fun LaunchEmbeddedComponentsScreenPreviewWithSelectedAccount() {
+    EmbeddedComponentsLauncherScreen(
         embeddedComponentName = "Payouts",
         selectedAccount = Merchant(merchantId = "1", displayName = "Selected Merchant"),
         connectSDKAccounts = listOf(
@@ -112,8 +112,8 @@ fun LaunchEmbeddedComponentsScreenPreviewWithSelectedAccount() {
 
 @Preview(showBackground = true)
 @Composable
-fun LaunchEmbeddedComponentsScreenPreviewWithNoSelectedAccount() {
-    LaunchEmbeddedComponentsScreen(
+private fun LaunchEmbeddedComponentsScreenPreviewWithNoSelectedAccount() {
+    EmbeddedComponentsLauncherScreen(
         embeddedComponentName = "Payouts",
         selectedAccount = null,
         connectSDKAccounts = listOf(
@@ -128,8 +128,8 @@ fun LaunchEmbeddedComponentsScreenPreviewWithNoSelectedAccount() {
 
 @Preview(showBackground = true)
 @Composable
-fun LaunchEmbeddedComponentsScreenPreviewWithEmptyAccounts() {
-    LaunchEmbeddedComponentsScreen(
+private fun LaunchEmbeddedComponentsScreenPreviewWithEmptyAccounts() {
+    EmbeddedComponentsLauncherScreen(
         embeddedComponentName = "Payouts",
         selectedAccount = Merchant(merchantId = "1", displayName = "Selected Merchant"),
         connectSDKAccounts = emptyList(),

diff --git a/...roid/connectsdk/example/ui/features/accountonboarding/AccountOnboardingExampleActivity.kt b/...roid/connectsdk/example/ui/features/accountonboarding/AccountOnboardingExampleActivity.kt
@@ -23,7 +23,7 @@ import com.stripe.android.connectsdk.PrivateBetaConnectSDK
 import com.stripe.android.connectsdk.example.ConnectSdkExampleTheme
 import com.stripe.android.connectsdk.example.MainContent
 import com.stripe.android.connectsdk.example.R
-import com.stripe.android.connectsdk.example.ui.common.LaunchEmbeddedComponentsScreen
+import com.stripe.android.connectsdk.example.ui.common.EmbeddedComponentsLauncherScreen
 
 class AccountOnboardingExampleActivity : FragmentActivity() {
 
@@ -47,7 +47,7 @@ class AccountOnboardingExampleActivity : FragmentActivity() {
                             if (isAccountOnboardingVisible) {
                                 AccountOnboardingComponentWrapper(onDismiss = { isAccountOnboardingVisible = false })
                             } else {
-                                LaunchEmbeddedComponentsScreen(
+                                EmbeddedComponentsLauncherScreen(
                                     embeddedComponentName = stringResource(R.string.account_onboarding),
                                     selectedAccount = accountOnboardingExampleState.selectedAccount,
                                     connectSDKAccounts = accounts,

diff --git a/.../java/com/stripe/android/connectsdk/example/ui/features/payouts/PayoutsExampleActivity.kt b/.../java/com/stripe/android/connectsdk/example/ui/features/payouts/PayoutsExampleActivity.kt
@@ -23,7 +23,7 @@ import com.stripe.android.connectsdk.PrivateBetaConnectSDK
 import com.stripe.android.connectsdk.example.ConnectSdkExampleTheme
 import com.stripe.android.connectsdk.example.MainContent
 import com.stripe.android.connectsdk.example.R
-import com.stripe.android.connectsdk.example.ui.common.LaunchEmbeddedComponentsScreen
+import com.stripe.android.connectsdk.example.ui.common.EmbeddedComponentsLauncherScreen
 
 class PayoutsExampleActivity : FragmentActivity() {
 
@@ -47,7 +47,7 @@ class PayoutsExampleActivity : FragmentActivity() {
                             if (isPayoutsVisible) {
                                 PayoutsComponentWrapper(onDismiss = { isPayoutsVisible = false })
                             } else {
-                                LaunchEmbeddedComponentsScreen(
+                                EmbeddedComponentsLauncherScreen(
                                     embeddedComponentName = stringResource(R.string.payouts),
                                     selectedAccount = payoutsExampleState.selectedAccount,
                                     connectSDKAccounts = accounts,