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

Author: dora4

docs/README.md

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

docs/es/README.md

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

docs/fr/README.md

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

docs/ko/README.md

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

docs/zh-cn/README.md

@@ -18,7 +18,7 @@ dependencyResolutionManagement {
 dependencies {
     // 扩展包必须在有主框架dora的情况下使用
     implementation("com.github.dora4:dora:1.3.43")
-    implementation("com.github.dora4:dora-walletconnect-support:2.1.30")
+    implementation("com.github.dora4:dora-walletconnect-support:2.1.31")
 }
 ```
 

docs/zh-tw/README.md

@@ -18,7 +18,7 @@ dependencyResolutionManagement {
 dependencies {
     // 擴展包必須與主框架 "dora" 一起使用
     implementation("com.github.dora4:dora:1.3.43")
-    implementation("com.github.dora4:dora-walletconnect-support:2.1.30")
+    implementation("com.github.dora4:dora-walletconnect-support:2.1.31")
 }
 ```
 

lib/build.gradle.kts

@@ -59,8 +59,8 @@ android {
 }
 
 dependencies {
-    implementation("com.github.dora4:dora:1.3.39")
-    api("com.github.dora4:dview-alert-dialog:1.25")
+    implementation("com.github.dora4:dora:1.3.43")
+    api("com.github.dora4:dview-alert-dialog:1.28")
     // wallet connect
     api(platform("com.walletconnect:android-bom:1.31.4"))
     api("com.walletconnect:android-core")
@@ -75,7 +75,7 @@ afterEvaluate {
                 from(components["release"])
                 groupId = "com.github.dora4"
                 artifactId = "dora-walletconnect-support"
-                version = "2.1.30"
+                version = "2.1.31"
             }
         }
     }

lib/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java

@@ -62,7 +62,7 @@ protected void onPause() {
     }
 
     private void showDisconnectDialog() {
-        DoraAlertDialog dialog = new DoraAlertDialog(this);
+        DoraAlertDialog dialog = DoraAlertDialog.create(this);
         dialog.title(getString(R.string.warm_prompt));
         dialog.message(getString(R.string.cancel_connection_query));
         dialog.themeColor(DoraFund.INSTANCE.getThemeColor());

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

@@ -280,22 +280,36 @@ object DoraFund {
 
     /**
      * Connect to a cold wallet.
+     * Launches the wallet connection screen from a given context without expecting a result.
+     *
+     * @param context The context used to start the wallet connection activity.
      * @since 2.0
      */
     fun connectWallet(context: Context) {
         IntentUtils.startActivity(context, WalletConnectActivity::class.java)
     }
 
     /**
-     * Connect to a cold wallet and pay immediately after connection.
+     * Connect to a cold wallet and perform a payment immediately after the connection succeeds.
+     * This method starts the wallet connection activity for a result,
+     * allowing the caller to handle the connection or payment outcome in onActivityResult.
+     *
+     * @param activity The activity used to start the wallet connection.
+     * @param requestCode The request code used to identify the result in onActivityResult.
      * @since 2.0
      */
     fun connectWallet(activity: Activity, requestCode: Int) {
         IntentUtils.startActivityForResult(activity, WalletConnectActivity::class.java, requestCode)
     }
 
     /**
-     * Connect to a cold wallet from a Fragment.
+     * Connect to a cold wallet from a Fragment using the new Activity Result API.
+     * This method registers a launcher for the WalletContract and launches it immediately.
+     *
+     * @param fragment The Fragment from which the wallet connection is initiated.
+     * @param onResult Optional callback invoked when the wallet connection finishes.
+     *                 The WalletResult contains information about the connection status,
+     *                 or null if the operation was canceled or failed.
      * @since 2.1
      */
     @JvmOverloads
@@ -307,6 +321,28 @@ object DoraFund {
         connectWalletLauncher.launch(Unit)
     }
 
+    /**
+     * Ensures that a wallet is connected before performing an action.
+     * If a wallet is already connected, it immediately invokes the callback with null.
+     * Otherwise, it initiates the wallet connection process.
+     *
+     * @param fragment The Fragment from which the wallet connection is initiated.
+     * @param onResult Callback invoked after the connection attempt.
+     *                 If the wallet is already connected, the result will be null.
+     * @since 2.1
+     */
+    fun ensureConnectWallet(fragment: Fragment, onResult: (WalletResult) -> Unit) {
+        if (isWalletConnected()) {
+            onResult.invoke(WalletResult(getCurrentChain()?.id ?: "",
+                getCurrentChain()?.chainName ?: "", getCurrentAddress()))
+        } else {
+            connectWallet(fragment = fragment) {
+                onResult(WalletResult(it?.chainId ?: "", it?.chainName ?: "",
+                    it?.address ?: ""))
+            }
+        }
+    }
+
     /**
      * Disconnect from cold wallet.
      * @since 2.0
@@ -722,7 +758,7 @@ object DoraFund {
         orderListener: OrderListener
     ) {
         if (payListener == null) throw PaymentException("No PayListener is set.")
-        DoraAlertDialog(context).show(
+        DoraAlertDialog.create(context).show(
             "$goodsDesc\n\n${
                 ContextCompat.getString(
                     context,
@@ -778,7 +814,7 @@ object DoraFund {
         orderListener: OrderListener
     ) {
         if (payListener == null) throw PaymentException("No PayListener is set.")
-        DoraAlertDialog(context).show(
+        DoraAlertDialog.create(context).show(
             "$goodsDesc\n\n${
                 ContextCompat.getString(
                     context,
@@ -843,7 +879,7 @@ object DoraFund {
         orderListener: OrderListener
     ) {
         if (payListener == null) throw PaymentException("No PayListener is set.")
-        DoraAlertDialog(context).show(
+        DoraAlertDialog.create(context).show(
             "$goodsDesc\n\n${
                 ContextCompat.getString(
                     context,
@@ -933,7 +969,7 @@ object DoraFund {
         }
 
         if (payListener == null) throw PaymentException("No PayListener is set.")
-        DoraAlertDialog(context).show(
+        DoraAlertDialog.create(context).show(
             "$goodsDesc\n\n${
                 ContextCompat.getString(
                     context,