Release 5.1.0

Author: mutumbakato

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 5.1.0 - 04 Sep 2025
+
+- Adds the `androidShowAnnotationCreationAction` configuration option to hide the default annotation creation button while keeping annotation editing functionality enabled on Android. (J#HYB-864)
+- Adds `OfficeConversionSettings` for configuring Office document conversion parameters in Nutrient Flutter Web, including spreadsheet dimension controls. (J#HYB-861)
+- Adds annotation contextual menu customization support with `AnnotationMenuConfiguration`. (J#HYB-683)
+- Improves event listeners handling for better performance and reliability. (J#HYB-868)
+- Updates to Nutrient iOS SDK 14.12.0 with the latest features and fixes.
+- Updates to Nutrient Android SDK 10.5.0 with the latest features and fixes.
+- Updates Kotlin version to 2.1.20 for compatibility with Nutrient Android SDK 10.6.0.
+- Fixes an iOS issue where the signature dialog would immediately dismiss when entering annotation creation mode programmatically. (J#HYB-859)
+- Fixes an Android race condition when calling `getPageInfo` immediately after `onDocumentLoaded` on a cold start. (J#HYB-870)
+
 ## 5.0.1 - 24 Jul 2025
 
 - Update README.md files to include the latest rebranding changes for Nutrient Flutter SDK. (J#HYB-842)

analysis_options.yaml

@@ -8,7 +8,8 @@
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
-#  exclude:
+  exclude:
+    - lib/src/api/nutrient_api.g.dart
 #    - ../../core/Vendor
   errors:
     invalid_assignment: error

android/build.gradle

@@ -60,16 +60,16 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
     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.8.1"
+    implementation "androidx.compose.material:material:1.8.3"
     implementation "androidx.constraintlayout:constraintlayout:2.2.1"
     implementation "androidx.constraintlayout:constraintlayout-compose:1.1.1"
-    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("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2") // Use the latest stable version
+    implementation "androidx.compose.foundation:foundation:1.8.3"
+    implementation "androidx.compose.ui:ui:1.8.3"
     implementation("io.noties.markwon:core:4.6.2")
     implementation("io.noties.markwon:html:4.6.2")
     implementation("io.noties.markwon:linkify:4.6.2")

android/config.gradle

@@ -38,7 +38,7 @@ if (pspdfkitMavenUrl == null || pspdfkitMavenUrl == '') {
 
 ext.pspdfkitVersion = localProperties.getProperty('pspdfkit.version')
 if (pspdfkitVersion == null || pspdfkitVersion == '') {
-    ext.pspdfkitVersion = '10.4.1'
+    ext.pspdfkitVersion = '10.5.0'
 }
 
 ext.pspdfkitMavenModuleName = 'nutrient'
@@ -56,4 +56,4 @@ ext.androidCompileSdkVersion = 35
 ext.androidMinSdkVersion = 21
 ext.androidTargetSdkVersion = 35
 ext.androidGradlePluginVersion = '8.9.2'
-ext.kotlinVersion = "1.9.20"
+ext.kotlinVersion = "2.1.20"

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

@@ -92,6 +92,7 @@ class ConfigurationAdapter {
     // Annotation, Forms and Bookmark Options
     private static final String ENABLE_ANNOTATION_EDITING = "enableAnnotationEditing";
     private static final String SHOW_ANNOTATION_LIST_ACTION = "showAnnotationListAction";
+    private static final String SHOW_ANNOTATION_CREATION_ACTION = "showAnnotationCreationAction";
 
     private static final String SIGNATURE_SAVING_STRATEGY = "signatureSavingStrategy";
 
@@ -216,12 +217,16 @@ class ConfigurationAdapter {
     @NonNull
     private final PdfActivityConfiguration.Builder configuration;
     @Nullable
+    private final HashMap<String, Object> configurationMap;
+    @Nullable
     private String password = null;
     private boolean enableInstantComments = false;
+    private boolean hideAnnotationCreationButton = false;
 
     ConfigurationAdapter(@NonNull Context context,
                          @Nullable HashMap<String, Object> configurationMap) {
         this.configuration = new PdfActivityConfiguration.Builder(context);
+        this.configurationMap = configurationMap;
         if (configurationMap != null && !configurationMap.isEmpty()) {
             String key = null;
 
@@ -289,6 +294,10 @@ class ConfigurationAdapter {
             if (key != null) {
                 configureShowAnnotationListAction((Boolean) configurationMap.get(key));
             }
+            key = getKeyOfType(configurationMap, SHOW_ANNOTATION_CREATION_ACTION, Boolean.class);
+            if (key != null) {
+                configureShowAnnotationCreationAction((Boolean) configurationMap.get(key));
+            }
             key = getKeyOfType(configurationMap, SHOW_PAGE_NUMBER_OVERLAY, Boolean.class);
             if (key != null) {
                 configureShowPageLabels((Boolean) configurationMap.get(key));
@@ -646,7 +655,9 @@ private void configureShowSearchAction(boolean showSearchAction) {
     }
 
     private void configureImmersiveMode(boolean immersiveMode) {
-        configuration.useImmersiveMode(immersiveMode);
+        // useImmersiveMode() method removed in SDK 10.6.0 - immersive mode is now default (true)
+        // If developers need to disable it, they should set it to false in PdfActivityConfiguration
+        // configuration.useImmersiveMode(immersiveMode);
     }
 
     private void configureShowThumbnailBar(@NonNull String showThumbnailBar) {
@@ -682,6 +693,19 @@ private void configureShowAnnotationListAction(boolean showAnnotationListAction)
         configuration.annotationListEnabled(showAnnotationListAction);
     }
 
+    private void configureShowAnnotationCreationAction(boolean showAnnotationCreationAction) {
+        // Store the configuration to pass to the fragment
+        this.hideAnnotationCreationButton = !showAnnotationCreationAction;
+        
+        // Try to configure annotation editing at the PSPDFKit level
+        // Note: We keep annotation editing enabled but hide the button
+        if (!showAnnotationCreationAction) {
+            // We could potentially disable specific annotation tools here
+            // but we want to keep the editing functionality, just hide the main button
+            Log.d("ConfigurationAdapter", "Configured to hide annotation creation button");
+        }
+    }
+
     private void configureShowPageLabels(boolean showPageLabels) {
         configuration.pageLabelsEnabled(showPageLabels);
         configuration.pageNumberOverlayEnabled(showPageLabels);
@@ -935,7 +959,72 @@ private static <T> String javaToDartTypeConverted(Class<T> clazz) {
         throw new IllegalArgumentException("Undefined dart type conversion for " + clazz.getName());
     }
 
+    /**
+     * Extracts annotation menu configuration from the configuration map.
+     * 
+     * @return The annotation menu configuration data, or null if not configured
+     */
     @Nullable
+    public com.pspdfkit.flutter.pspdfkit.api.AnnotationMenuConfigurationData getAnnotationMenuConfiguration() {
+        if (configurationMap == null) {
+            return null;
+        }
+        
+        @SuppressWarnings("unchecked")
+        Map<String, Object> annotationMenuConfig = (Map<String, Object>) configurationMap.get("annotationMenuConfiguration");
+        
+        if (annotationMenuConfig == null) {
+            return null;
+        }
+        
+        try {
+            // Extract items to remove (now using enum indices)
+            @SuppressWarnings("unchecked")
+            List<Number> itemsToRemoveIndices = (List<Number>) annotationMenuConfig.get("itemsToRemove");
+            List<com.pspdfkit.flutter.pspdfkit.api.AnnotationMenuAction> itemsToRemove = new ArrayList<>();
+            if (itemsToRemoveIndices != null) {
+                for (Number index : itemsToRemoveIndices) {
+                    com.pspdfkit.flutter.pspdfkit.api.AnnotationMenuAction action = 
+                        com.pspdfkit.flutter.pspdfkit.api.AnnotationMenuAction.values()[index.intValue()];
+                    itemsToRemove.add(action);
+                }
+            }
+            
+            // Extract items to disable (now using enum indices)
+            @SuppressWarnings("unchecked")
+            List<Number> itemsToDisableIndices = (List<Number>) annotationMenuConfig.get("itemsToDisable");
+            List<com.pspdfkit.flutter.pspdfkit.api.AnnotationMenuAction> itemsToDisable = new ArrayList<>();
+            if (itemsToDisableIndices != null) {
+                for (Number index : itemsToDisableIndices) {
+                    com.pspdfkit.flutter.pspdfkit.api.AnnotationMenuAction action = 
+                        com.pspdfkit.flutter.pspdfkit.api.AnnotationMenuAction.values()[index.intValue()];
+                    itemsToDisable.add(action);
+                }
+            }
+            
+            // Extract other configuration options
+            Boolean showStylePicker = (Boolean) annotationMenuConfig.get("showStylePicker");
+            Boolean groupMarkupItems = (Boolean) annotationMenuConfig.get("groupMarkupItems");
+            Number maxVisibleItems = (Number) annotationMenuConfig.get("maxVisibleItems");
+            
+            return new com.pspdfkit.flutter.pspdfkit.api.AnnotationMenuConfigurationData(
+                itemsToRemove,
+                itemsToDisable,
+                showStylePicker != null ? showStylePicker : true,
+                groupMarkupItems != null ? groupMarkupItems : false,
+                maxVisibleItems != null ? maxVisibleItems.longValue() : null
+            );
+            
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "Error parsing annotation menu configuration", e);
+            return null;
+        }
+    }
+
+    boolean shouldHideAnnotationCreationButton() {
+        return hideAnnotationCreationButton;
+    }
+
     String getPassword() {
         return password;
     }