Release 4.4.0

Author: PSPDFKit

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 4.4.0 - 10 Jun 2025
+
+- Adds AI Assistant support. (J#HYB-742)
+- Adds `addWebEventListener` and `removeWebEventListener` APIs to `PspdfkitWidgetController` for Flutter Web. (J#HYB-760)
+- Fixes missing resource ID issue with Android Gradle Plugin (AGP) version 8.9.2. (J#HYB-808)
+- Fixes issue where PDF viewer fails to load when the mounting container has zero width on Flutter Web. (J#HYB-812)
+
 ## 4.3.0 - 11 Apr 2025
 
 - Adds setting custom stamp items support. Only custom text stamps are supported, and this is available only on iOS and Android for now. (J#HYB-715) 

android/build.gradle

@@ -19,7 +19,6 @@ buildscript {
     }
 }
 
-
 group 'com.pspdfkit.flutter.pspdfkit'
 version pspdfkitFlutterVersion
 
@@ -65,10 +64,17 @@ dependencies {
     implementation "io.nutrient:$pspdfkitMavenModuleName:$pspdfkitVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "androidx.compose.material:material:1.7.8"
-    implementation "androidx.compose.material:material:1.7.8"
+    implementation "androidx.compose.material:material:1.8.1"
     implementation "androidx.constraintlayout:constraintlayout:2.2.1"
     implementation "androidx.constraintlayout:constraintlayout-compose:1.1.1"
-    implementation "androidx.compose.foundation:foundation:1.7.8"
-    implementation "androidx.compose.ui:ui:1.7.8"
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.0") // Use the latest stable version
+    implementation "androidx.compose.foundation:foundation:1.8.1"
+    implementation "androidx.compose.ui:ui:1.8.1"
+    implementation("io.noties.markwon:core:4.6.2")
+    implementation("io.noties.markwon:html:4.6.2")
+    implementation("io.noties.markwon:linkify:4.6.2")
+    implementation("io.noties.markwon:ext-tables:4.6.2")
+    implementation("io.noties.markwon:ext-strikethrough:4.6.2")
+    implementation("io.socket:socket.io-client:2.1.1")
+    implementation("com.squareup.okhttp3:logging-interceptor:4.9.3") // Replace 4.x.x with the latest stable version
 }

android/config.gradle

@@ -55,5 +55,5 @@ ext.pspdfkitFlutterVersion = pubspecYaml.version
 ext.androidCompileSdkVersion = 35
 ext.androidMinSdkVersion = 21
 ext.androidTargetSdkVersion = 35
-ext.androidGradlePluginVersion = '8.7.3'
+ext.androidGradlePluginVersion = '8.9.2'
 ext.kotlinVersion = "1.9.20"

android/src/main/java/com/pspdfkit/flutter/pspdfkit/ConfigurationAdapter.java

@@ -204,6 +204,8 @@ class ConfigurationAdapter {
     private static final String MINIMUM_ZOOM_SCALE = "minimumZoomScale";
     private static final  String DEFAULT_ZOOM_SCALE = "defaultZoomScale";
 
+    private static final String ENABLE_AI_ASSISTANT = "enableAiAssistant";
+
     private static final Map<String, SignatureSavingStrategy> signatureSavingStrategyMap = new HashMap<>(){{
         put("alwaysSave", SignatureSavingStrategy.ALWAYS_SAVE);
         put("saveIfSelected", SignatureSavingStrategy.SAVE_IF_SELECTED);
@@ -426,6 +428,10 @@ class ConfigurationAdapter {
             if (key !=null){
                 configureSignatureCreationConfiguration((HashMap<String, Object>) configurationMap.get(key));
             }
+            key = getKeyOfType(configurationMap, ENABLE_AI_ASSISTANT, Boolean.class);
+            if (key != null) {
+                configureAiAssistant((Boolean) configurationMap.get(key));
+            }
         }
     }
 
@@ -884,6 +890,10 @@ private void configureMeasurementToolSnappingEnabled(Context context,Boolean aBo
         PSPDFKitPreferences.get(context).setMeasurementSnappingEnabled(aBoolean);
     }
 
+    private void configureAiAssistant(Boolean aBoolean) {
+        configuration.setAiAssistantEnabled(aBoolean);
+    }
+
     private <T> boolean containsKeyOfType(@NonNull HashMap<String, Object> configurationMap,
                                           @NonNull String key,
                                           @NonNull Class<T> clazz) {

android/src/main/java/com/pspdfkit/flutter/pspdfkit/FlutterPdfUiFragment.kt

@@ -10,9 +10,7 @@
 package com.pspdfkit.flutter.pspdfkit
 
 import android.content.Context
-import android.graphics.Color
 import android.graphics.drawable.Drawable
-import android.graphics.drawable.Icon
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -25,13 +23,14 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
+import androidx.core.graphics.toColorInt
 import androidx.core.view.MenuHost
 import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import com.pspdfkit.document.PdfDocument
 import com.pspdfkit.flutter.pspdfkit.api.CustomToolbarCallbacks
 import com.pspdfkit.ui.PdfUiFragment
-
+import com.pspdfkit.R
 
 class FlutterPdfUiFragment : PdfUiFragment(), MenuProvider {
 
@@ -40,7 +39,6 @@ class FlutterPdfUiFragment : PdfUiFragment(), MenuProvider {
     private var customToolbarCallbacks: CustomToolbarCallbacks? = null
     private var customToolbarItems: List<Map<String, Any>>? = null
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -52,7 +50,6 @@ class FlutterPdfUiFragment : PdfUiFragment(), MenuProvider {
         }
     }
 
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -227,7 +224,7 @@ class FlutterPdfUiFragment : PdfUiFragment(), MenuProvider {
             // Apply tint if specified
             if (drawable != null && iconColorHex != null) {
                 try {
-                    val color = Color.parseColor(iconColorHex)
+                    val color = iconColorHex.toColorInt()
                     DrawableCompat.setTint(drawable, color)
                     Log.d(
                         "FlutterPdfUiFragment",

android/src/main/java/com/pspdfkit/flutter/pspdfkit/FlutterPdfUiFragmentCallbacks.kt

@@ -31,6 +31,7 @@ import com.pspdfkit.listeners.DocumentListener
 import com.pspdfkit.ui.PdfFragment
 import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.MethodChannel
+import io.nutrient.domain.ai.AiAssistant
 
 private const val LOG_TAG = "FlutterPdfUiCallbacks"
 
@@ -47,7 +48,9 @@ class FlutterPdfUiFragmentCallbacks(
     private val methodChannel: MethodChannel, 
     private val measurementConfigurations: List<Map<String, Any>>?,
     private val binaryMessenger: BinaryMessenger,
-    private val flutterWidgetCallback: FlutterWidgetCallback
+    private val flutterWidgetCallback: FlutterWidgetCallback,
+    private val aiAssistant: AiAssistant?
+
 ) : FragmentManager.FragmentLifecycleCallbacks(), DocumentListener {
 
     private var pdfFragment: PdfFragment? = null
@@ -111,6 +114,14 @@ class FlutterPdfUiFragmentCallbacks(
         } catch (e: Exception) {
             Log.e(LOG_TAG, "Error sending direct event notification", e)
         }
+
+        aiAssistant?.let {
+            try {
+                document.setAiAssistant(it)
+            } catch (e: Exception) {
+                Log.e(LOG_TAG, "Error setting AiAssistant on loaded document", e)
+            }
+        }
     }
 
     override fun onPageChanged(document: PdfDocument, pageIndex: Int) {

android/src/main/java/com/pspdfkit/flutter/pspdfkit/PSPDFKitView.kt

@@ -11,9 +11,9 @@ package com.pspdfkit.flutter.pspdfkit
 import android.content.Context
 import android.content.ContextWrapper
 import android.content.MutableContextWrapper
-import android.net.Uri
 import android.util.Log
 import android.view.View
+import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentContainerView
@@ -39,6 +39,9 @@ import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.StandardMessageCodec
 import io.flutter.plugin.platform.PlatformView
 import io.flutter.plugin.platform.PlatformViewFactory
+import io.nutrient.data.models.AiAssistantConfiguration
+import io.nutrient.domain.ai.AiAssistant
+import io.nutrient.domain.ai.standaloneAiAssistant
 
 internal class PSPDFKitView(
     val context: Context,
@@ -59,6 +62,7 @@ internal class PSPDFKitView(
     private val customToolbarCallbacks: CustomToolbarCallbacks = CustomToolbarCallbacks(messenger, "customToolbar.callbacks.$id")
     private var isFragmentAttached = false
     private var methodCallHandler: PSPDFKitWidgetMethodCallHandler? = null
+    private var aiAssistant: AiAssistant? = null
 
     init {
         fragmentContainerView?.id = View.generateViewId()
@@ -70,6 +74,7 @@ internal class PSPDFKitView(
         val toolbarGroupingItems: List<Any>? = configurationMap?.get("toolbarItemGrouping") as List<Any>?
         val measurementValueConfigurations =
             configurationMap?.get("measurementValueConfigurations") as List<Map<String, Any>>?
+        val aiAssistantConfigurationMap = configurationMap?.get("aiAssistant") as Map<String, Any>?
 
         try {
             //noinspection pspdfkit-experimental
@@ -79,17 +84,17 @@ internal class PSPDFKitView(
                     FlutterPdfUiFragment::class.java
                 ).configuration(pdfConfiguration).build()
             } else {
-                val uri = Uri.parse(addFileSchemeIfMissing(documentPath))
+                val uri = addFileSchemeIfMissing(documentPath).toUri()
                 Log.d(LOG_TAG, "Loading document from URI: $uri")
-                
+
                 // Validate that the URI is accessible
                 try {
                     context.contentResolver.openInputStream(uri)?.close()
                 } catch (e: Exception) {
                     Log.w(LOG_TAG, "Document URI may not be accessible: $uri", e)
                     // Continue anyway as PSPDFKit might handle this differently
                 }
-                
+
                 val isImageDocument = isImageDocument(documentPath)
                 if (isImageDocument) {
                     Log.d(LOG_TAG, "Initializing PdfUiFragment with image document")
@@ -105,10 +110,10 @@ internal class PSPDFKitView(
                         .build()
                 }
             }
-            Log.d(LOG_TAG, "PdfUiFragment initialized successfully")
+            setupAiAssistant(context, aiAssistantConfigurationMap)
 
             fragmentCallbacks = FlutterPdfUiFragmentCallbacks(methodChannel, measurementValueConfigurations,
-                messenger,FlutterWidgetCallback(widgetCallbacks))
+                messenger,FlutterWidgetCallback(widgetCallbacks),aiAssistant)
 
             fragmentCallbacks?.let { callbacks ->
                 getFragmentActivity(context).supportFragmentManager.registerFragmentLifecycleCallbacks(callbacks, true)
@@ -158,7 +163,7 @@ internal class PSPDFKitView(
             }
         }, true)
 
-        fragmentContainerView?.let { it ->
+        fragmentContainerView?.let {
             it.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
                 override fun onViewAttachedToWindow(view: View) {
                     try {
@@ -208,7 +213,7 @@ internal class PSPDFKitView(
             if (isFragmentAttached) {
                 try {
                     val fragmentActivity = getFragmentActivity(context)
-                    if (!fragmentActivity.isFinishing && !fragmentActivity.isDestroyed 
+                    if (!fragmentActivity.isFinishing && !fragmentActivity.isDestroyed
                         && fragmentActivity.supportFragmentManager.isDestroyed.not()) {
                         fragmentActivity.supportFragmentManager.commit {
                             pdfUiFragment.let { if (it.isAdded) remove(it) }
@@ -220,11 +225,11 @@ internal class PSPDFKitView(
                 }
                 isFragmentAttached = false
             }
-            
+
             // Cleanup other resources
             pspdfkitViewImpl.setPdfFragment(null)
             pspdfkitViewImpl.dispose()
-            
+
             // Unregister callbacks and listeners
             fragmentCallbacks?.let {
                 try {
@@ -233,14 +238,14 @@ internal class PSPDFKitView(
                     Log.e(LOG_TAG, "Error unregistering fragment lifecycle callbacks", e)
                 }
             }
-            
+
             // Null out references
             fragmentCallbacks = null
             fragmentContainerView = null
-            
+
             // Unregister method channel
             PspdfkitWidgetControllerApi.setUp(messenger, null, id.toString())
-            
+
             Log.d(LOG_TAG, "PSPDFKitView disposed successfully")
         } catch (e: Exception) {
             Log.e(LOG_TAG, "Error during PSPDFKitView disposal", e)
@@ -302,6 +307,29 @@ internal class PSPDFKitView(
             }
     }
 
+    private fun setupAiAssistant(
+        context: Context,
+        configuration: Map<String, Any>?
+    ) {
+        // Initialize the AiAssistant with the provided parameters
+        val serverUrl = configuration?.get("serverUrl") as String?
+        val jwt = configuration?.get("jwt") as String?
+        val sessionId = configuration?.get("sessionId") as String?
+        val userId = configuration?.get("userId") as String?
+
+        if (serverUrl != null && jwt != null) {
+            val aiAssistantConfiguration = AiAssistantConfiguration(
+                serverUrl = serverUrl,
+                jwt = jwt ,
+                sessionId = sessionId?: "",
+                userId = userId ?: ""
+            )
+            aiAssistant = standaloneAiAssistant(context, aiAssistantConfiguration)
+        } else {
+            Log.e(LOG_TAG, "Invalid AI Assistant configuration")
+        }
+    }
+
     companion object {
         private const val LOG_TAG = "PSPDFKitPlugin"
     }

android/src/main/java/com/pspdfkit/flutter/pspdfkit/document/FlutterPdfDocument.kt

@@ -9,8 +9,6 @@
 
 package com.pspdfkit.flutter.pspdfkit.document
 
-import android.util.Log
-import com.pspdfkit.annotations.Annotation
 import com.pspdfkit.document.PdfDocument
 import com.pspdfkit.document.formatters.DocumentJsonFormatter
 import com.pspdfkit.document.formatters.XfdfFormatter
@@ -37,6 +35,9 @@ import java.io.File
 import java.io.FileOutputStream
 import java.nio.charset.StandardCharsets
 import java.util.EnumSet
+import android.util.Log
+import com.pspdfkit.annotations.Annotation
+import kotlinx.serialization.json.Json
 
 class FlutterPdfDocument(
     private val pdfDocument: PdfDocument
@@ -375,8 +376,7 @@ class FlutterPdfDocument(
 
     override fun removeAnnotation(jsonAnnotation: String, callback: (Result<Boolean?>) -> Unit) {
         try {
-            val annotationObject = JSONObject(jsonAnnotation).toMap()
-
+            val annotationObject = Json.decodeFromString<Map<String,Any>>(jsonAnnotation)
             // Get name or UUID
             val name = annotationObject["name"] as? String?
             val uuid = annotationObject["id"] as? String?
@@ -597,20 +597,4 @@ class FlutterPdfDocument(
             pdfVersionMap[options.pdfVersion]
         )
     }
-}
-
-fun JSONObject.toMap(): Map<String, Any> {
-    val map = mutableMapOf<String, Any>()
-    val keys = this.keys()
-    while (keys.hasNext()) {
-        val key = keys.next()
-        var value = this.get(key)
-
-        if (value is JSONObject) {
-            value = value.toMap()
-        }
-
-        map[key] = value
-    }
-    return map
-}
+}

android/src/main/java/com/pspdfkit/flutter/pspdfkit/util/Utilities.kt

@@ -4,6 +4,7 @@ package com.pspdfkit.flutter.pspdfkit.util
 import android.net.Uri
 import java.lang.NumberFormatException
 import java.util.Locale
+import androidx.core.net.toUri
 
 private const val FILE_SCHEME = "file:///"
 
@@ -14,7 +15,7 @@ private const val FILE_SCHEME = "file:///"
  */
 fun addFileSchemeIfMissing(documentPath: String): String {
     var result = documentPath
-    if (Uri.parse(result).scheme == null) {
+    if (result.toUri().scheme == null) {
         if (result.startsWith("/")) {
             result = documentPath.substring(1)
         }