From d32c38e30dc660b385fff996ca650d6cc253abed Mon Sep 17 00:00:00 2001 From: Damilola Odujoko Date: Tue, 12 Mar 2024 15:03:35 +0100 Subject: [PATCH] Feat: Clean up Android SDK snippet --- .../android-sdk/payment-sheet-init.js | 28 ++++++++++++----- .../android-sdk/payment-sheet-launch.js | 11 ++++--- .../android-sdk/payment-sheet-result-full.js | 30 +++++++++---------- .../android-sdk/payment-sheet-result-init.js | 8 +++-- .../android-sdk/payment-sheet-init/index.java | 14 ++++++++- .../android-sdk/payment-sheet-init/index.kt | 14 +++++---- .../payment-sheet-launch/index.java | 5 +++- .../android-sdk/payment-sheet-launch/index.kt | 6 ++-- .../payment-sheet-result-full/index.java | 28 ++++++++--------- .../payment-sheet-result-full/index.kt | 2 +- .../payment-sheet-result-init/index.java | 6 +++- .../payment-sheet-result-init/index.kt | 2 +- 12 files changed, 98 insertions(+), 56 deletions(-) diff --git a/dist/doc/developer-tools/android-sdk/payment-sheet-init.js b/dist/doc/developer-tools/android-sdk/payment-sheet-init.js index 08987cf..3ba1fe6 100644 --- a/dist/doc/developer-tools/android-sdk/payment-sheet-init.js +++ b/dist/doc/developer-tools/android-sdk/payment-sheet-init.js @@ -1,14 +1,28 @@ const kt = `private lateinit var paymentSheet: PaymentSheet -override fun onCreate(savedInstanceState: Bundle?) { +override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - - paymentSheet = PaymentSheet(this) { paymentResult -> - // Handle payment result here. - } - + setContentView(R.layout.activity_main) + + // library initialization code snippets and others go here + + paymentSheet = PaymentSheet(this, ::paymentComplete) + + // more snippet }` -const java = `// TODO: Add snippet` +const java = `private PaymentSheet paymentSheet; + +@Override +protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + // library initialization code snippets and others go here + + paymentSheet = new PaymentSheet(this, this::paymentComplete); + + // other code snippet +}` export {kt, java} \ No newline at end of file diff --git a/dist/doc/developer-tools/android-sdk/payment-sheet-launch.js b/dist/doc/developer-tools/android-sdk/payment-sheet-launch.js index 6146fc0..2104c5d 100644 --- a/dist/doc/developer-tools/android-sdk/payment-sheet-launch.js +++ b/dist/doc/developer-tools/android-sdk/payment-sheet-launch.js @@ -1,8 +1,11 @@ -const kt = `fun startPayment() { - val accessCode = initializeTransactionOnServer() - paymentSheet.launch(accessCode) +const kt = `fun makePayment() { + // Pass access_code from transaction initialize call on the server + paymentSheet.launch("br6cgmvflhn3qtd") }` -const java = `// TODO: Add snippet` +const java = `private void makePayment() { + // Pass access_code from transaction initialize call on the server + paymentSheet.launch("br6cgmvflhn3qtd"); +}` export {kt, java} \ No newline at end of file diff --git a/dist/doc/developer-tools/android-sdk/payment-sheet-result-full.js b/dist/doc/developer-tools/android-sdk/payment-sheet-result-full.js index 6ec7ed8..9b571bc 100644 --- a/dist/doc/developer-tools/android-sdk/payment-sheet-result-full.js +++ b/dist/doc/developer-tools/android-sdk/payment-sheet-result-full.js @@ -1,4 +1,4 @@ -const kt = `private fun paymentComplete(paymentSheetResult: PaymentSheetResult ) { +const kt = `private fun paymentComplete(paymentSheetResult: PaymentSheetResult) { val message = when (paymentSheetResult) { PaymentSheetResult.Cancelled -> "Cancelled" is PaymentSheetResult.Failed -> { @@ -16,25 +16,25 @@ const kt = `private fun paymentComplete(paymentSheetResult: PaymentSheetResult ) Toast.makeText(this, "Payment $message", Toast.LENGTH_SHORT).show() }` -const java = `private void onPaymentResult(PaymentSheetResult paymentResult) { +const java = `private void paymentComplete(PaymentSheetResult paymentSheetResult) { String message; - if (paymentResult instanceof PaymentSheetResult.Cancelled) { + + if (paymentSheetResult instanceof PaymentSheetResult.Cancelled) { message = "Cancelled"; - } - else if (paymentResult instanceof PaymentSheetResult.Failed) { - PaymentSheetResult.Failed failedResult = (PaymentSheetResult.Failed) paymentResult; - Log.e(TAG, failedResult.getError().getMessage() != null ? - failedResult.getError().getMessage() : "Failed", failedResult.getError()); - message = failedResult.getError().getMessage() != null ? - failedResult.getError().getMessage() : "Failed"; - } - else if (paymentResult instanceof PaymentSheetResult.Completed) { - Log.d("Payment successful", paymentSheetResult.paymentCompletionDetails.toString()) + } else if (paymentSheetResult instanceof PaymentSheetResult.Failed) { + PaymentSheetResult.Failed failedResult = (PaymentSheetResult.Failed) paymentSheetResult; + Log.e("Payment failed", + failedResult.getError().getMessage() != null ? failedResult.getError().getMessage() : "Failed", + failedResult.getError()); + message = failedResult.getError().getMessage() != null ? failedResult.getError().getMessage() : "Failed"; + } else if (paymentSheetResult instanceof PaymentSheetResult.Completed) { + Log.d("Payment successful", + ((PaymentSheetResult.Completed) paymentSheetResult).getPaymentCompletionDetails().toString()); message = "Successful"; } else { - message = ""; + message = "You shouldn't be here"; } - + Toast.makeText(this, "Payment " + message, Toast.LENGTH_SHORT).show(); }` diff --git a/dist/doc/developer-tools/android-sdk/payment-sheet-result-init.js b/dist/doc/developer-tools/android-sdk/payment-sheet-result-init.js index d9d9a7b..61992d7 100644 --- a/dist/doc/developer-tools/android-sdk/payment-sheet-result-init.js +++ b/dist/doc/developer-tools/android-sdk/payment-sheet-result-init.js @@ -1,9 +1,13 @@ const kt = `import com.paystack.android.ui.paymentsheet.PaymentSheetResult -private fun paymentComplete(paymentSheetResult: PaymentSheetResult ) { +private fun paymentComplete(paymentSheetResult: PaymentSheetResult) { }` -const java = `// TODO: Add snippet` +const java = `import com.paystack.android.ui.paymentsheet.PaymentSheetResult; + +private void paymentComplete(PaymentSheetResult paymentSheetResult) { + +}` export {kt, java} \ No newline at end of file diff --git a/src/doc/developer-tools/android-sdk/payment-sheet-init/index.java b/src/doc/developer-tools/android-sdk/payment-sheet-init/index.java index d4c7a52..84b6a0a 100644 --- a/src/doc/developer-tools/android-sdk/payment-sheet-init/index.java +++ b/src/doc/developer-tools/android-sdk/payment-sheet-init/index.java @@ -1 +1,13 @@ -// TODO: Add snippet \ No newline at end of file +private PaymentSheet paymentSheet; + +@Override +protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + // library initialization code snippets and others go here + + paymentSheet = new PaymentSheet(this, this::paymentComplete); + + // other code snippet +} \ No newline at end of file diff --git a/src/doc/developer-tools/android-sdk/payment-sheet-init/index.kt b/src/doc/developer-tools/android-sdk/payment-sheet-init/index.kt index 2c959f6..1f0d64e 100644 --- a/src/doc/developer-tools/android-sdk/payment-sheet-init/index.kt +++ b/src/doc/developer-tools/android-sdk/payment-sheet-init/index.kt @@ -1,10 +1,12 @@ private lateinit var paymentSheet: PaymentSheet -override fun onCreate(savedInstanceState: Bundle?) { +override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - - paymentSheet = PaymentSheet(this) { paymentResult -> - // Handle payment result here. - } - + setContentView(R.layout.activity_main) + + // library initialization code snippets and others go here + + paymentSheet = PaymentSheet(this, ::paymentComplete) + + // more snippet } \ No newline at end of file diff --git a/src/doc/developer-tools/android-sdk/payment-sheet-launch/index.java b/src/doc/developer-tools/android-sdk/payment-sheet-launch/index.java index d4c7a52..7cb3fec 100644 --- a/src/doc/developer-tools/android-sdk/payment-sheet-launch/index.java +++ b/src/doc/developer-tools/android-sdk/payment-sheet-launch/index.java @@ -1 +1,4 @@ -// TODO: Add snippet \ No newline at end of file +private void makePayment() { + // Pass access_code from transaction initialize call on the server + paymentSheet.launch("br6cgmvflhn3qtd"); +} \ No newline at end of file diff --git a/src/doc/developer-tools/android-sdk/payment-sheet-launch/index.kt b/src/doc/developer-tools/android-sdk/payment-sheet-launch/index.kt index c1da841..099c3ec 100644 --- a/src/doc/developer-tools/android-sdk/payment-sheet-launch/index.kt +++ b/src/doc/developer-tools/android-sdk/payment-sheet-launch/index.kt @@ -1,4 +1,4 @@ -fun startPayment() { - val accessCode = initializeTransactionOnServer() - paymentSheet.launch(accessCode) +fun makePayment() { + // Pass access_code from transaction initialize call on the server + paymentSheet.launch("br6cgmvflhn3qtd") } \ No newline at end of file diff --git a/src/doc/developer-tools/android-sdk/payment-sheet-result-full/index.java b/src/doc/developer-tools/android-sdk/payment-sheet-result-full/index.java index 04b40b2..02b1f0b 100644 --- a/src/doc/developer-tools/android-sdk/payment-sheet-result-full/index.java +++ b/src/doc/developer-tools/android-sdk/payment-sheet-result-full/index.java @@ -1,21 +1,21 @@ -private void onPaymentResult(PaymentSheetResult paymentResult) { +private void paymentComplete(PaymentSheetResult paymentSheetResult) { String message; - if (paymentResult instanceof PaymentSheetResult.Cancelled) { + + if (paymentSheetResult instanceof PaymentSheetResult.Cancelled) { message = "Cancelled"; - } - else if (paymentResult instanceof PaymentSheetResult.Failed) { - PaymentSheetResult.Failed failedResult = (PaymentSheetResult.Failed) paymentResult; - Log.e(TAG, failedResult.getError().getMessage() != null ? - failedResult.getError().getMessage() : "Failed", failedResult.getError()); - message = failedResult.getError().getMessage() != null ? - failedResult.getError().getMessage() : "Failed"; - } - else if (paymentResult instanceof PaymentSheetResult.Completed) { - Log.d("Payment successful", paymentSheetResult.paymentCompletionDetails.toString()) + } else if (paymentSheetResult instanceof PaymentSheetResult.Failed) { + PaymentSheetResult.Failed failedResult = (PaymentSheetResult.Failed) paymentSheetResult; + Log.e("Payment failed", + failedResult.getError().getMessage() != null ? failedResult.getError().getMessage() : "Failed", + failedResult.getError()); + message = failedResult.getError().getMessage() != null ? failedResult.getError().getMessage() : "Failed"; + } else if (paymentSheetResult instanceof PaymentSheetResult.Completed) { + Log.d("Payment successful", + ((PaymentSheetResult.Completed) paymentSheetResult).getPaymentCompletionDetails().toString()); message = "Successful"; } else { - message = ""; + message = "You shouldn't be here"; } - + Toast.makeText(this, "Payment " + message, Toast.LENGTH_SHORT).show(); } \ No newline at end of file diff --git a/src/doc/developer-tools/android-sdk/payment-sheet-result-full/index.kt b/src/doc/developer-tools/android-sdk/payment-sheet-result-full/index.kt index 802bcf4..08d38a1 100644 --- a/src/doc/developer-tools/android-sdk/payment-sheet-result-full/index.kt +++ b/src/doc/developer-tools/android-sdk/payment-sheet-result-full/index.kt @@ -1,4 +1,4 @@ -private fun paymentComplete(paymentSheetResult: PaymentSheetResult ) { +private fun paymentComplete(paymentSheetResult: PaymentSheetResult) { val message = when (paymentSheetResult) { PaymentSheetResult.Cancelled -> "Cancelled" is PaymentSheetResult.Failed -> { diff --git a/src/doc/developer-tools/android-sdk/payment-sheet-result-init/index.java b/src/doc/developer-tools/android-sdk/payment-sheet-result-init/index.java index d4c7a52..2d21d95 100644 --- a/src/doc/developer-tools/android-sdk/payment-sheet-result-init/index.java +++ b/src/doc/developer-tools/android-sdk/payment-sheet-result-init/index.java @@ -1 +1,5 @@ -// TODO: Add snippet \ No newline at end of file +import com.paystack.android.ui.paymentsheet.PaymentSheetResult; + +private void paymentComplete(PaymentSheetResult paymentSheetResult) { + +} \ No newline at end of file diff --git a/src/doc/developer-tools/android-sdk/payment-sheet-result-init/index.kt b/src/doc/developer-tools/android-sdk/payment-sheet-result-init/index.kt index e01e12e..f25430e 100644 --- a/src/doc/developer-tools/android-sdk/payment-sheet-result-init/index.kt +++ b/src/doc/developer-tools/android-sdk/payment-sheet-result-init/index.kt @@ -1,5 +1,5 @@ import com.paystack.android.ui.paymentsheet.PaymentSheetResult -private fun paymentComplete(paymentSheetResult: PaymentSheetResult ) { +private fun paymentComplete(paymentSheetResult: PaymentSheetResult) { } \ No newline at end of file