Added an overloaded connectWallet method that supports the new ActivityResult API.(#17)

Author: dora4

build.gradle

@@ -1,5 +1,5 @@
 plugins {
     id 'com.android.library' version '8.1.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
+    id 'org.jetbrains.kotlin.android' version '2.2.21' apply false
     id 'com.github.dcendents.android-maven' version '1.5' apply false
 }

docs/README.md

@@ -17,8 +17,8 @@ Add the following code to the `build.gradle.kts` file in the `app` module:
 ```kotlin
 dependencies {
     // The extension package must be used with the main framework "dora"
-    implementation("com.github.dora4:dora:1.3.39")
-    implementation("com.github.dora4:dora-walletconnect-support:2.1.28")
+    implementation("com.github.dora4:dora:1.3.43")
+    implementation("com.github.dora4:dora-walletconnect-support:2.1.29")
 }
 ```
 

docs/es/README.md

@@ -17,8 +17,8 @@ Añade el siguiente código en el archivo `build.gradle.kts` del módulo `app`:
 ```kotlin
 dependencies {
     // El paquete de extensión debe usarse con el framework principal "dora"
-    implementation("com.github.dora4:dora:1.3.39")
-    implementation("com.github.dora4:dora-walletconnect-support:2.1.28")
+    implementation("com.github.dora4:dora:1.3.43")
+    implementation("com.github.dora4:dora-walletconnect-support:2.1.29")
 }
 ```
 

docs/fr/README.md

@@ -17,8 +17,8 @@ Ajoutez le code suivant dans le fichier `build.gradle.kts` du module `app` :
 ```kotlin
 dependencies {
     // Le package d'extension doit être utilisé avec le framework principal "dora"
-    implementation("com.github.dora4:dora:1.3.39")
-    implementation("com.github.dora4:dora-walletconnect-support:2.1.28")
+    implementation("com.github.dora4:dora:1.3.43")
+    implementation("com.github.dora4:dora-walletconnect-support:2.1.29")
 }
 ```
 

docs/ko/README.md

@@ -17,8 +17,8 @@ dependencyResolutionManagement {
 ```kotlin
 dependencies {
     // 확장 패키지는 메인 프레임워크 "dora"와 함께 사용해야 합니다.
-    implementation("com.github.dora4:dora:1.3.39")
-    implementation("com.github.dora4:dora-walletconnect-support:2.1.28")
+    implementation("com.github.dora4:dora:1.3.43")
+    implementation("com.github.dora4:dora-walletconnect-support:2.1.29")
 }
 ```
 

docs/zh-cn/README.md

@@ -17,8 +17,8 @@ dependencyResolutionManagement {
 ```kotlin
 dependencies {
     // 扩展包必须在有主框架dora的情况下使用
-    implementation("com.github.dora4:dora:1.3.39")
-    implementation("com.github.dora4:dora-walletconnect-support:2.1.28")
+    implementation("com.github.dora4:dora:1.3.43")
+    implementation("com.github.dora4:dora-walletconnect-support:2.1.29")
 }
 ```
 

docs/zh-tw/README.md

@@ -17,8 +17,8 @@ dependencyResolutionManagement {
 ```kotlin
 dependencies {
     // 擴展包必須與主框架 "dora" 一起使用
-    implementation("com.github.dora4:dora:1.3.39")
-    implementation("com.github.dora4:dora-walletconnect-support:2.1.28")
+    implementation("com.github.dora4:dora:1.3.43")
+    implementation("com.github.dora4:dora-walletconnect-support:2.1.29")
 }
 ```
 

lib/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 
 android {
     namespace = "dora.lifecycle.walletconnect"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 24
@@ -33,9 +33,6 @@ android {
     buildFeatures {
         aidl = true
     }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
@@ -78,7 +75,7 @@ afterEvaluate {
                 from(components["release"])
                 groupId = "com.github.dora4"
                 artifactId = "dora-walletconnect-support"
-                version = "2.1.28"
+                version = "2.1.29"
             }
         }
     }

lib/src/main/java/dora/pay/DoraFund.kt

@@ -5,12 +5,15 @@ import android.app.Application
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
+import android.content.Intent
 import android.graphics.Color
 import android.os.Build
 import android.util.Log
+import androidx.activity.result.contract.ActivityResultContract
 import androidx.annotation.ColorInt
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
 import com.walletconnect.android.Core
 import com.walletconnect.web3.modal.client.Modal
 import com.walletconnect.web3.modal.client.Web3Modal
@@ -19,6 +22,8 @@ import de.blinkt.openvpn.core.OpenVPNService
 import dora.lifecycle.walletconnect.R
 import dora.pay.activity.WalletConnectActivity
 import dora.pay.token.Token
+import dora.pay.wallet.WalletContract
+import dora.pay.wallet.WalletResult
 import dora.util.IntentUtils
 import dora.util.ToastUtils
 import dora.widget.DoraAlertDialog
@@ -274,21 +279,33 @@ object DoraFund {
     }
 
     /**
-     * Connect to cold wallet.
+     * Connect to a cold wallet.
      * @since 2.0
      */
     fun connectWallet(context: Context) {
         IntentUtils.startActivity(context, WalletConnectActivity::class.java)
     }
 
     /**
-     * Connect to cold wallet and pay immediately after connection.
+     * Connect to a cold wallet and pay immediately after connection.
      * @since 2.0
      */
     fun connectWallet(activity: Activity, requestCode: Int) {
         IntentUtils.startActivityForResult(activity, WalletConnectActivity::class.java, requestCode)
     }
 
+    /**
+     * Connect to a cold wallet from a Fragment.
+     * @since 2.1
+     */
+    fun connectWallet(fragment: Fragment, onResult: (WalletResult?) -> Unit) {
+        val connectWalletLauncher =
+            fragment.registerForActivityResult(WalletContract()) { result ->
+                onResult(result)
+            }
+        connectWalletLauncher.launch(Unit)
+    }
+
     /**
      * Disconnect from cold wallet.
      * @since 2.0

lib/src/main/java/dora/pay/activity/WalletConnectActivity.kt

@@ -1,13 +1,17 @@
 package dora.pay.activity
 
 import android.annotation.SuppressLint
-import android.app.Activity
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.walletconnect.web3.modal.ui.Web3ModalView
 import dora.lifecycle.walletconnect.R
+import dora.pay.DoraFund
+import dora.pay.wallet.WalletContract
 import dora.util.StatusBarUtils
 
+/**
+ * @since 2.0
+ */
 class WalletConnectActivity : AppCompatActivity() {
 
     @SuppressLint("UnsafeIntentLaunch")
@@ -16,7 +20,14 @@ class WalletConnectActivity : AppCompatActivity() {
         setContentView(R.layout.activity_wallet_connect)
         StatusBarUtils.setTransparencyStatusBar(this)
         findViewById<Web3ModalView>(R.id.web3Modal).setOnCloseModal {
-            setResult(Activity.RESULT_OK)
+            if (DoraFund.isWalletConnected()) {
+                intent.putExtra(WalletContract.EXTRA_CHAIN_ID, DoraFund.getCurrentChain()?.id)
+                intent.putExtra(WalletContract.EXTRA_CHAIN_NAME, DoraFund.getCurrentChain()?.chainName)
+                intent.putExtra(WalletContract.EXTRA_ERC20_ADDRESS, DoraFund.getCurrentAddress())
+                setResult(RESULT_OK, intent)
+            } else {
+                setResult(RESULT_CANCELED)
+            }
             finish()
         }
     }