From 7a453a88ed5cba89fb30d53093f87708df760884 Mon Sep 17 00:00:00 2001
From: Damilola Odujoko <damilola.odujoko@paystack.com>
Date: Fri, 6 Nov 2020 12:40:25 +0100
Subject: [PATCH 1/6] Feat: Add kotlin code

---
 app/build.gradle                              |   9 +-
 .../foodcheckout/CheckoutActivity.java        | 120 ------------------
 .../paystack/foodcheckout/CheckoutActivity.kt | 103 +++++++++++++++
 .../paystack/foodcheckout/MainActivity.java   |  27 ----
 .../com/paystack/foodcheckout/MainActivity.kt |  23 ++++
 build.gradle                                  |   2 +
 6 files changed, 136 insertions(+), 148 deletions(-)
 delete mode 100644 app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.java
 create mode 100644 app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.kt
 delete mode 100644 app/src/main/java/com/paystack/foodcheckout/MainActivity.java
 create mode 100644 app/src/main/java/com/paystack/foodcheckout/MainActivity.kt

diff --git a/app/build.gradle b/app/build.gradle
index 60f4364..d96fa94 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.application'
+    id 'kotlin-android'
 }
 
 android {
@@ -27,13 +28,19 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 dependencies {
 
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
diff --git a/app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.java b/app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.java
deleted file mode 100644
index 17a9fc9..0000000
--- a/app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.paystack.foodcheckout;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.widget.Button;
-import android.widget.Toast;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.google.android.material.textfield.TextInputLayout;
-
-import java.util.Objects;
-
-import co.paystack.android.Paystack;
-import co.paystack.android.PaystackSdk;
-import co.paystack.android.Transaction;
-import co.paystack.android.model.Card;
-import co.paystack.android.model.Charge;
-
-public class CheckoutActivity extends AppCompatActivity {
-
-    private TextInputLayout mCardNumber;
-    private TextInputLayout mCardExpiry;
-    private TextInputLayout mCardCVV;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_checkout);
-
-        initializePaystack();
-        initializeFormVariables();
-    }
-
-    private void initializePaystack() {
-        PaystackSdk.initialize(getApplicationContext());
-        PaystackSdk.setPublicKey(BuildConfig.PSTK_PUBLIC_KEY);
-    }
-
-
-    private void initializeFormVariables() {
-        mCardNumber = findViewById(R.id.til_card_number);
-        mCardExpiry = findViewById(R.id.til_card_expiry);
-        mCardCVV = findViewById(R.id.til_card_cvv);
-
-        // this is used to add a forward slash (/) between the cards expiry month
-        // and year (11/21). After the month is entered, a forward slash is added
-        // before the year
-
-        Objects.requireNonNull(mCardExpiry.getEditText()).addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                if(s.toString().length() == 2 && !s.toString().contains("/")) {
-                    s.append("/");
-                }
-            }
-        });
-
-        Button button = findViewById(R.id.btn_make_payment);
-        button.setOnClickListener(v -> performCharge());
-    }
-
-    private void performCharge() {
-        Intent intent = getIntent();
-
-        String cardNumber = mCardNumber.getEditText().getText().toString();
-        String cardExpiry = mCardExpiry.getEditText().getText().toString();
-        String cvv = mCardCVV.getEditText().getText().toString();
-
-        String[] cardExpiryArray = cardExpiry.split("/");
-        int expiryMonth = Integer.parseInt(cardExpiryArray[0]);
-        int expiryYear = Integer.parseInt(cardExpiryArray[1]);
-        int amount = intent.getIntExtra(getString(R.string.meal_name), 0);
-        amount *= 100;
-
-        Card card = new Card(cardNumber, expiryMonth, expiryYear, cvv);
-
-        Charge charge = new Charge();
-        charge.setAmount(amount);
-        charge.setEmail("customer@email.com");
-        charge.setCard(card);
-
-        PaystackSdk.chargeCard(this, charge, new Paystack.TransactionCallback() {
-            @Override
-            public void onSuccess(Transaction transaction) {
-                parseResponse(transaction.getReference());
-            }
-
-            @Override
-            public void beforeValidate(Transaction transaction) {
-                Log.d("Main Activity", "beforeValidate: " + transaction.getReference());
-            }
-
-            @Override
-            public void onError(Throwable error, Transaction transaction) {
-                Log.d("Main Activity", "onError: " + error.getLocalizedMessage());
-                Log.d("Main Activity", "onError: " + error);
-            }
-
-        });
-    }
-
-    private void parseResponse(String transactionReference) {
-        String message = "Payment Successful - " + transactionReference;
-        Toast.makeText(this, message, Toast.LENGTH_LONG).show();
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.kt b/app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.kt
new file mode 100644
index 0000000..c75e649
--- /dev/null
+++ b/app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.kt
@@ -0,0 +1,103 @@
+package com.paystack.foodcheckout
+
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.util.Log
+import android.widget.Button
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import co.paystack.android.Paystack.TransactionCallback
+import co.paystack.android.PaystackSdk
+import co.paystack.android.Transaction
+import co.paystack.android.model.Card
+import co.paystack.android.model.Charge
+import com.google.android.material.textfield.TextInputLayout
+
+class CheckoutActivity : AppCompatActivity() {
+    private lateinit var mCardNumber: TextInputLayout
+    private lateinit var mCardExpiry: TextInputLayout
+    private lateinit var mCardCVV: TextInputLayout
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_checkout)
+
+        initializePaystack()
+        initializeFormVariables()
+    }
+
+    private fun initializePaystack() {
+        PaystackSdk.initialize(applicationContext)
+        PaystackSdk.setPublicKey(BuildConfig.PSTK_PUBLIC_KEY)
+    }
+
+    private fun initializeFormVariables() {
+        mCardNumber = findViewById(R.id.til_card_number)
+        mCardExpiry = findViewById(R.id.til_card_expiry)
+        mCardCVV = findViewById(R.id.til_card_cvv)
+
+        // this is used to add a forward slash (/) between the cards expiry month
+        // and year (11/21). After the month is entered, a forward slash is added
+        // before the year
+        mCardExpiry.editText!!.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+
+            }
+
+            override fun afterTextChanged(s: Editable?) {
+                if (s.toString().length == 2 && !s.toString().contains("/")) {
+                    s!!.append("/")
+                }
+            }
+
+        })
+
+        val button = findViewById<Button>(R.id.btn_make_payment)
+        button.setOnClickListener { performCharge() }
+    }
+
+    private fun performCharge() {
+        val cardNumber = mCardNumber.editText!!.text.toString()
+        val cardExpiry = mCardExpiry.editText!!.text.toString()
+        val cvv = mCardCVV.editText!!.text.toString()
+
+        val cardExpiryArray = cardExpiry.split("/").toTypedArray()
+        val expiryMonth = cardExpiryArray[0].toInt()
+        val expiryYear = cardExpiryArray[1].toInt()
+        var amount = intent.getIntExtra(getString(R.string.meal_name), 0)
+        amount *= 100
+
+        val card = Card(cardNumber, expiryMonth, expiryYear, cvv)
+
+        val charge = Charge()
+        charge.amount = amount
+        charge.email = "customer@email.com"
+        charge.card = card
+
+        PaystackSdk.chargeCard(this, charge, object : TransactionCallback {
+            override fun onSuccess(transaction: Transaction) {
+                parseResponse(transaction.reference)
+            }
+
+            override fun beforeValidate(transaction: Transaction) {
+                Log.d("Main Activity", "beforeValidate: " + transaction.reference)
+            }
+
+            override fun onError(error: Throwable, transaction: Transaction) {
+                Log.d("Main Activity", "onError: " + error.localizedMessage)
+                Log.d("Main Activity", "onError: $error")
+            }
+        })
+    }
+
+    private fun parseResponse(transactionReference: String) {
+        val message = "Payment Successful - $transactionReference"
+        Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+        Log.d("Payment success: ", transactionReference)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/paystack/foodcheckout/MainActivity.java b/app/src/main/java/com/paystack/foodcheckout/MainActivity.java
deleted file mode 100644
index 88943c4..0000000
--- a/app/src/main/java/com/paystack/foodcheckout/MainActivity.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.paystack.foodcheckout;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-
-public class MainActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        int price = 4000;
-        Button mCheckout = findViewById(R.id.btn_checkout);
-
-        mCheckout.setOnClickListener(v -> {
-            Intent intent = new Intent(MainActivity.this, CheckoutActivity.class);
-            intent.putExtra(getString(R.string.meal_name), price);
-            startActivity(intent);
-        });
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt b/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt
new file mode 100644
index 0000000..dd42df8
--- /dev/null
+++ b/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt
@@ -0,0 +1,23 @@
+package com.paystack.foodcheckout
+
+import androidx.appcompat.app.AppCompatActivity
+
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Button
+
+class MainActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        val price  = 4000
+        val mCheckout: Button = findViewById(R.id.btn_checkout)
+        mCheckout.setOnClickListener {
+            val intent = Intent(this, CheckoutActivity::class.java).apply {
+                putExtra(getString(R.string.meal_name), price)
+            }
+            startActivity(intent)
+        }
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c8d7712..24d1382 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+    ext.kotlin_version = "1.4.10"
     repositories {
         google()
         jcenter()
     }
     dependencies {
         classpath "com.android.tools.build:gradle:4.1.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From 00d63c9988c618597b35b19c5f344bae22c0906e Mon Sep 17 00:00:00 2001
From: Damilola Odujoko <damilola.odujoko@paystack.com>
Date: Fri, 6 Nov 2020 13:53:56 +0100
Subject: [PATCH 2/6] Chore: Update README

---
 README.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2c30830..2ae3425 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,19 @@
 # FoodCheckout
-A simple application that shows how to integrate the Paystack SDK into your Android app.
\ No newline at end of file
+A simple application that shows how to integrate the Paystack SDK into your Android app. There's an
+accompanying guide that explains how you should go about your integration:
+
+<div float="left">
+    <img src="https://drive.google.com/uc?export=view&id=1HFfmIO7HQ-9xgde85yt-l_dAvbvJZL2h" width="320" />
+    <img src="https://drive.google.com/uc?export=view&id=1Vip9xUkumkNyL1JDWGCwv_M7HAfZwJ_O" width="320" />
+</div>
+
+
+# Project Setup
+- Clone project and open on Android Studio
+- The Java source code is on the `main` branch while the Kotlin is on the `kotlin` branch:
+    - To use the Kotlin source code: `git checkout kotlin`
+    - To use the Java source code: `git checkout main`
+- Open the `gradle.properties` file and add the following param:
+  - PSTK_PUBLIC_KEY="your_paystack_public_key"
+- Sync project
+- Run the project when sync is successful
\ No newline at end of file

From 31d60180b36afb0d54a16351ffdc2f3538bf2ae0 Mon Sep 17 00:00:00 2001
From: Damilola Odujoko <damilola.odujoko@paystack.com>
Date: Fri, 23 Apr 2021 11:46:42 +0100
Subject: [PATCH 3/6] Chore: Clean up code

---
 app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.kt | 2 +-
 app/src/main/java/com/paystack/foodcheckout/MainActivity.kt     | 2 +-
 app/src/main/res/values/strings.xml                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.kt b/app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.kt
index c75e649..78322a5 100644
--- a/app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.kt
+++ b/app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.kt
@@ -76,7 +76,7 @@ class CheckoutActivity : AppCompatActivity() {
 
         val charge = Charge()
         charge.amount = amount
-        charge.email = "customer@email.com"
+        charge.email = "damilola@test.com"
         charge.card = card
 
         PaystackSdk.chargeCard(this, charge, object : TransactionCallback {
diff --git a/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt b/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt
index dd42df8..1215644 100644
--- a/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt
+++ b/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt
@@ -11,7 +11,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        val price  = 4000
+        val price  = 2000
         val mCheckout: Button = findViewById(R.id.btn_checkout)
         mCheckout.setOnClickListener {
             val intent = Intent(this, CheckoutActivity::class.java).apply {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5ec5c91..d990ed2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
         A properly seasoned patty topped with a slice of fresh tomato, cheese and lettuce enclosed in a
         fluffy bun. It’s accompanied with a side of fries with a sweet and spicy dip.
     </string>
-    <string name="meal_price">Pay &#x20A6;4,000</string>
+    <string name="meal_price">Pay &#x20A6;2000</string>
     <string name="payment_prompt">Card details</string>
     <string name="card_number">Card Number</string>
     <string name="card_expiry">Card Expiry</string>

From abf174dc2507a65cbaa56d648ef714ff3bd87fac Mon Sep 17 00:00:00 2001
From: Damilola Odujoko <damilola.odujoko@paystack.com>
Date: Tue, 12 Mar 2024 11:00:47 +0100
Subject: [PATCH 4/6] Chore: Migrate Kotlin sample to use new SDK

---
 .gitignore                                    |   1 +
 .idea/compiler.xml                            |   2 +-
 .idea/deploymentTargetDropDown.xml            |  10 ++
 .idea/gradle.xml                              |   7 +-
 .idea/kotlinc.xml                             |   6 +
 .idea/migrations.xml                          |  10 ++
 .idea/misc.xml                                |   2 +-
 app/build.gradle                              |  27 ++--
 app/src/main/AndroidManifest.xml              |   8 +-
 .../paystack/foodcheckout/CheckoutActivity.kt | 103 ---------------
 .../com/paystack/foodcheckout/MainActivity.kt |  41 +++++-
 app/src/main/res/layout/activity_checkout.xml | 118 ------------------
 app/src/main/res/values/strings.xml           |   6 +-
 build.gradle                                  |  10 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 15 files changed, 90 insertions(+), 263 deletions(-)
 create mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 .idea/kotlinc.xml
 create mode 100644 .idea/migrations.xml
 delete mode 100644 app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.kt
 delete mode 100644 app/src/main/res/layout/activity_checkout.xml

diff --git a/.gitignore b/.gitignore
index a915fcc..477f734 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 .cxx
 local.properties
 gradle.properties
+*.hprof
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..0c0c338
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="app">
+        <State />
+      </entry>
+    </value>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 23a89bb..cb865f6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,18 +4,15 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..8d81632
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.9.22" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5d35ec..55c0ec2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index d96fa94..6b4bf69 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,18 +4,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
-
     defaultConfig {
         applicationId "com.paystack.foodcheckout"
-        minSdkVersion 21
-        targetSdkVersion 29
+        compileSdk 34
+        minSdkVersion 23
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        buildConfigField("String", "PSTK_PUBLIC_KEY", PSTK_PUBLIC_KEY)
     }
 
     buildTypes {
@@ -32,19 +29,21 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+
+    namespace 'com.paystack.foodcheckout'
 }
 
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     // secondary dependencies
-    implementation 'co.paystack.android:paystack:3.1.2'
+    implementation 'com.paystack.android:paystack-ui:0.0.5'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d666b6a..195ad6e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.paystack.foodcheckout">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -11,8 +10,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.FoodCheckout">
-        <activity android:name=".CheckoutActivity"></activity>
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -20,5 +19,4 @@
             </intent-filter>
         </activity>
     </application>
-
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.kt b/app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.kt
deleted file mode 100644
index 78322a5..0000000
--- a/app/src/main/java/com/paystack/foodcheckout/CheckoutActivity.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.paystack.foodcheckout
-
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Log
-import android.widget.Button
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import co.paystack.android.Paystack.TransactionCallback
-import co.paystack.android.PaystackSdk
-import co.paystack.android.Transaction
-import co.paystack.android.model.Card
-import co.paystack.android.model.Charge
-import com.google.android.material.textfield.TextInputLayout
-
-class CheckoutActivity : AppCompatActivity() {
-    private lateinit var mCardNumber: TextInputLayout
-    private lateinit var mCardExpiry: TextInputLayout
-    private lateinit var mCardCVV: TextInputLayout
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_checkout)
-
-        initializePaystack()
-        initializeFormVariables()
-    }
-
-    private fun initializePaystack() {
-        PaystackSdk.initialize(applicationContext)
-        PaystackSdk.setPublicKey(BuildConfig.PSTK_PUBLIC_KEY)
-    }
-
-    private fun initializeFormVariables() {
-        mCardNumber = findViewById(R.id.til_card_number)
-        mCardExpiry = findViewById(R.id.til_card_expiry)
-        mCardCVV = findViewById(R.id.til_card_cvv)
-
-        // this is used to add a forward slash (/) between the cards expiry month
-        // and year (11/21). After the month is entered, a forward slash is added
-        // before the year
-        mCardExpiry.editText!!.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-
-            }
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-
-            }
-
-            override fun afterTextChanged(s: Editable?) {
-                if (s.toString().length == 2 && !s.toString().contains("/")) {
-                    s!!.append("/")
-                }
-            }
-
-        })
-
-        val button = findViewById<Button>(R.id.btn_make_payment)
-        button.setOnClickListener { performCharge() }
-    }
-
-    private fun performCharge() {
-        val cardNumber = mCardNumber.editText!!.text.toString()
-        val cardExpiry = mCardExpiry.editText!!.text.toString()
-        val cvv = mCardCVV.editText!!.text.toString()
-
-        val cardExpiryArray = cardExpiry.split("/").toTypedArray()
-        val expiryMonth = cardExpiryArray[0].toInt()
-        val expiryYear = cardExpiryArray[1].toInt()
-        var amount = intent.getIntExtra(getString(R.string.meal_name), 0)
-        amount *= 100
-
-        val card = Card(cardNumber, expiryMonth, expiryYear, cvv)
-
-        val charge = Charge()
-        charge.amount = amount
-        charge.email = "damilola@test.com"
-        charge.card = card
-
-        PaystackSdk.chargeCard(this, charge, object : TransactionCallback {
-            override fun onSuccess(transaction: Transaction) {
-                parseResponse(transaction.reference)
-            }
-
-            override fun beforeValidate(transaction: Transaction) {
-                Log.d("Main Activity", "beforeValidate: " + transaction.reference)
-            }
-
-            override fun onError(error: Throwable, transaction: Transaction) {
-                Log.d("Main Activity", "onError: " + error.localizedMessage)
-                Log.d("Main Activity", "onError: $error")
-            }
-        })
-    }
-
-    private fun parseResponse(transactionReference: String) {
-        val message = "Payment Successful - $transactionReference"
-        Toast.makeText(this, message, Toast.LENGTH_LONG).show()
-        Log.d("Payment success: ", transactionReference)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt b/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt
index 1215644..347687f 100644
--- a/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt
+++ b/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt
@@ -2,22 +2,53 @@ package com.paystack.foodcheckout
 
 import androidx.appcompat.app.AppCompatActivity
 
-import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.widget.Button
+import android.widget.Toast
+import com.paystack.android_sdk.core.Paystack
+import com.paystack.android_sdk.ui.paymentsheet.PaymentSheet
+import com.paystack.android_sdk.ui.paymentsheet.PaymentSheetResult
 
 class MainActivity : AppCompatActivity() {
+    private lateinit var paymentSheet: PaymentSheet
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        val price  = 2000
+        Paystack.builder()
+            .setPublicKey("pk_test_xxxx")
+            .build()
+        paymentSheet = PaymentSheet(this, ::paymentComplete)
+
         val mCheckout: Button = findViewById(R.id.btn_checkout)
         mCheckout.setOnClickListener {
-            val intent = Intent(this, CheckoutActivity::class.java).apply {
-                putExtra(getString(R.string.meal_name), price)
+            makePayment()
+        }
+    }
+
+    private fun makePayment() {
+        // Pass access_code from transaction initialize call
+        paymentSheet.launch("br6cgmvflhn3qtd")
+    }
+
+
+    private fun paymentComplete(paymentSheetResult: PaymentSheetResult) {
+        val message = when (paymentSheetResult) {
+            PaymentSheetResult.Cancelled -> "Cancelled"
+            is PaymentSheetResult.Failed -> {
+                Log.e("Something went wrong", paymentSheetResult.error.message.orEmpty(), paymentSheetResult.error)
+                paymentSheetResult.error.message ?: "Failed"
+            }
+
+            is PaymentSheetResult.Completed -> {
+                // Returns the transaction reference  PaymentCompletionDetails(reference={TransactionRef})
+                Log.d("Payment successful", paymentSheetResult.paymentCompletionDetails.toString())
+                "Successful"
             }
-            startActivity(intent)
         }
+
+        Toast.makeText(this, "Payment $message", Toast.LENGTH_SHORT).show()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_checkout.xml b/app/src/main/res/layout/activity_checkout.xml
deleted file mode 100644
index 12296b1..0000000
--- a/app/src/main/res/layout/activity_checkout.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/cod_gray_900"
-    android:padding="16dp"
-    tools:context=".CheckoutActivity">
-
-    <TextView
-        android:id="@+id/tv_payment_prompt"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginTop="@dimen/dimen_32"
-        android:layout_marginStart="@dimen/dimen_16"
-        android:layout_marginEnd="@dimen/dimen_16"
-        android:text="@string/payment_prompt"
-        android:textSize="@dimen/text_24"
-        android:textColor="@color/azac_500" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/til_card_number"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dimen_16"
-        android:layout_marginTop="@dimen/dimen_32"
-        android:layout_marginEnd="@dimen/dimen_16"
-        android:hint="@string/card_number"
-        android:textColorHint="@color/silver_400"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_payment_prompt"
-        app:hintTextColor="@color/silver_400"
-        app:boxStrokeColor="@color/azac_500"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:inputType="text"
-            android:textColor="@color/white">
-
-        </com.google.android.material.textfield.TextInputEditText>
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/til_card_expiry"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dimen_16"
-        android:layout_marginTop="@dimen/dimen_32"
-        android:layout_marginEnd="@dimen/dimen_16"
-        android:hint="@string/card_expiry"
-        android:textColorHint="@color/silver_400"
-        app:layout_constraintTop_toBottomOf="@id/til_card_number"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/til_card_cvv"
-        app:boxStrokeColor="@color/azac_500"
-        app:hintTextColor="@color/silver_400"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:inputType="text"
-            android:textColor="@color/white">
-
-        </com.google.android.material.textfield.TextInputEditText>
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/til_card_cvv"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dimen_16"
-        android:layout_marginTop="@dimen/dimen_32"
-        android:layout_marginEnd="@dimen/dimen_16"
-        android:textColorHint="@color/silver_400"
-        app:layout_constraintTop_toBottomOf="@id/til_card_number"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/til_card_expiry"
-        app:boxStrokeColor="@color/azac_500"
-        app:hintTextColor="@color/silver_400"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:inputType="text"
-            android:hint="@string/card_cvv"
-            android:textColor="@color/white">
-
-        </com.google.android.material.textfield.TextInputEditText>
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <Button
-        android:id="@+id/btn_make_payment"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dimen_16"
-        android:layout_marginEnd="@dimen/dimen_16"
-        android:layout_marginBottom="@dimen/dimen_16"
-        android:backgroundTint="@color/azac_500"
-        android:textColor="@color/cod_gray_900"
-        android:text="@string/meal_price"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d990ed2..7805453 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,9 +5,5 @@
         A properly seasoned patty topped with a slice of fresh tomato, cheese and lettuce enclosed in a
         fluffy bun. It’s accompanied with a side of fries with a sweet and spicy dip.
     </string>
-    <string name="meal_price">Pay &#x20A6;2000</string>
-    <string name="payment_prompt">Card details</string>
-    <string name="card_number">Card Number</string>
-    <string name="card_expiry">Card Expiry</string>
-    <string name="card_cvv">CVV</string>
+    <string name="meal_price">Make Payment</string>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 24d1382..7ad5cd6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.10"
+    ext.kotlin_version = '1.9.22'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.0"
+        classpath 'com.android.tools.build:gradle:8.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -17,10 +17,10 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 15c36a3..2ba747c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip

From 1dab06f2480a18520b986bc0e709c2bcfcacb27f Mon Sep 17 00:00:00 2001
From: Damilola Odujoko <damilola.odujoko@paystack.com>
Date: Mon, 13 May 2024 10:42:30 +0100
Subject: [PATCH 5/6] Chore: Upgrade PaystackUI

---
 .idea/deploymentTargetSelector.xml            | 22 +++++++++++++++++++
 app/build.gradle                              |  6 ++---
 .../com/paystack/foodcheckout/MainActivity.kt |  6 ++---
 3 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 .idea/deploymentTargetSelector.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..25be67b
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="app.androidTest">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="Food Checkout.Food_Checkout.app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="app.unitTest">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="app.main">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 6b4bf69..278192f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,14 +36,14 @@ android {
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     // secondary dependencies
-    implementation 'com.paystack.android:paystack-ui:0.0.5'
+    implementation 'com.paystack.android:paystack-ui:0.0.7'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt b/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt
index 347687f..ddfc9fd 100644
--- a/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt
+++ b/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt
@@ -6,9 +6,9 @@ import android.os.Bundle
 import android.util.Log
 import android.widget.Button
 import android.widget.Toast
-import com.paystack.android_sdk.core.Paystack
-import com.paystack.android_sdk.ui.paymentsheet.PaymentSheet
-import com.paystack.android_sdk.ui.paymentsheet.PaymentSheetResult
+import com.paystack.android.core.Paystack
+import com.paystack.android.ui.paymentsheet.PaymentSheet
+import com.paystack.android.ui.paymentsheet.PaymentSheetResult
 
 class MainActivity : AppCompatActivity() {
     private lateinit var paymentSheet: PaymentSheet

From 01f05e57bdf7e4207f073488fee25c57bf687109 Mon Sep 17 00:00:00 2001
From: Damilola Odujoko <damilola.odujoko@paystack.com>
Date: Wed, 15 May 2024 10:29:18 +0100
Subject: [PATCH 6/6] Chore: Upgrade PaystackUI

---
 app/build.gradle                                            | 2 +-
 app/src/main/java/com/paystack/foodcheckout/MainActivity.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 278192f..9af1a35 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,5 +45,5 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     // secondary dependencies
-    implementation 'com.paystack.android:paystack-ui:0.0.7'
+    implementation 'com.paystack.android:paystack-ui:0.0.8'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt b/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt
index ddfc9fd..1e048ed 100644
--- a/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt
+++ b/app/src/main/java/com/paystack/foodcheckout/MainActivity.kt
@@ -30,7 +30,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun makePayment() {
         // Pass access_code from transaction initialize call
-        paymentSheet.launch("br6cgmvflhn3qtd")
+        paymentSheet.launch("rtz03myg0lbpe11")
     }