Release 3.4.0

Author: PSPDFKit

CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Newest Release
 
+### 3.4.0 - 26 Oct 2022
+
+- Adds generating PDF from images, templates and HTML. (#36736)
+- Updates for PSPDFKit 8.4.1 Android. (#37192)
+- Updates for PSPDFKit  12.0 for iOS. (#37192)
+- Fixes keyboard cutting off search results when inline search is disabled. (#35418)
+- Fixes an issue where the `PspdfkitView` widget is not rendered in Flutter versions 3.3.0 and above on Android. (#37044)
+## Previous Releases
+
 ### 3.3.0 - 19 Jul 2022
 
 - Moved package files from `lib/src` to `lib` to remove import warnings and renamed `main.dart` to `pspdfkit.dart`. (#34058)
@@ -11,8 +20,6 @@
 - Fixes an issue where tapping on form fields yields unexpected behavior in the Catalog basic example. (#33853)
 - Fixes the configuration option `userInterfaceViewMode: 'alwaysHidden'` not hiding the widget’s top bar on iOS. (#31095)
 
-## Previous Releases
-
 ### 3.2.2 - 16 Mar 2022
 
 - Improves the example project by using the `PlatformUtils` class to check for supported platforms (#33212)

android/build.gradle

@@ -37,7 +37,6 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion androidCompileSdkVersion
-    buildToolsVersion androidBuildToolsVersion
 
     compileOptions {
         sourceCompatibility 1.8

android/config.gradle

@@ -38,7 +38,7 @@ if (pspdfkitMavenUrl == null || pspdfkitMavenUrl == '') {
 
 ext.pspdfkitVersion = localProperties.getProperty('pspdfkit.version')
 if (pspdfkitVersion == null || pspdfkitVersion == '') {
-    ext.pspdfkitVersion = '8.2.1'
+    ext.pspdfkitVersion = '8.4.1'
 }
 
 ext.pspdfkitMavenModuleName = 'pspdfkit'
@@ -53,7 +53,6 @@ def pubspecYaml = new Yaml().load(pubspecFile.newInputStream())
 ext.pspdfkitFlutterVersion = pubspecYaml.version
 
 ext.androidCompileSdkVersion = 31
-ext.androidBuildToolsVersion = '30.0.3'
 ext.androidMinSdkVersion = 21
 ext.androidTargetSdkVersion = 30
 ext.androidGradlePluginVersion = '7.1.1'

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

@@ -1,6 +1,7 @@
 package com.pspdfkit.flutter.pspdfkit
 
 import android.content.Context
+import android.content.MutableContextWrapper
 import android.net.Uri
 import android.view.View
 import androidx.fragment.app.FragmentActivity
@@ -17,6 +18,10 @@ import com.pspdfkit.forms.EditableButtonFormElement
 import com.pspdfkit.forms.SignatureFormElement
 import com.pspdfkit.forms.TextFormElement
 import com.pspdfkit.ui.PdfUiFragment
+import com.pspdfkit.document.processor.PdfProcessor
+import com.pspdfkit.document.processor.PdfProcessorTask
+import com.pspdfkit.document.processor.NewPage
+import com.pspdfkit.document.processor.PagePattern
 import com.pspdfkit.ui.PdfUiFragmentBuilder
 import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.MethodCall
@@ -29,9 +34,20 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import org.json.JSONObject
 import java.io.ByteArrayOutputStream
+import java.io.File
+import android.app.Activity
+import android.content.Intent
+import android.graphics.BitmapFactory
+import android.graphics.RectF
+import android.os.Bundle
+import com.pspdfkit.configuration.activity.PdfActivityConfiguration
+import com.pspdfkit.document.processor.PageImage
+import com.pspdfkit.ui.PdfActivity
+import com.pspdfkit.utils.Size
+import java.io.FileInputStream
 
 internal class PSPDFKitView(
-    context: Context,
+    val context: Context,
     id: Int,
     messenger: BinaryMessenger,
     documentPath: String? = null,
@@ -69,14 +85,14 @@ internal class PSPDFKitView(
         fragmentContainerView?.let {
             it.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
                 override fun onViewAttachedToWindow(view: View?) {
-                    (context as FragmentActivity).supportFragmentManager.commit {
+                  getFragmentActivity(context).supportFragmentManager.commit {
                         add(it.id, pdfUiFragment)
                         setReorderingAllowed(true)
                     }
                 }
 
                 override fun onViewDetachedFromWindow(view: View?) {
-                    (context as FragmentActivity).supportFragmentManager.commit {
+                    getFragmentActivity(context).supportFragmentManager.commit {
                         remove(pdfUiFragment)
                         setReorderingAllowed(true)
                     }
@@ -368,6 +384,21 @@ internal class PSPDFKitView(
         }
     }
 
+    // Get Fragment Activity from context
+    private fun getFragmentActivity(context: Context): FragmentActivity {
+       return when (context) {
+           is FragmentActivity -> {
+               context
+           }
+           is MutableContextWrapper -> {
+               getFragmentActivity(context.baseContext)
+           }
+           else -> {
+               throw IllegalStateException("Context is not a FragmentActivity")
+           }
+       }
+    }
+
     companion object {
         private const val LOG_TAG = "PSPDFKitPlugin"
     }

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

@@ -0,0 +1,88 @@
+/*
+ *   Copyright © 2018-2022 PSPDFKit GmbH. All rights reserved.
+ *
+ *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
+ *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
+ *   UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
+ *   This notice may not be removed from this file.
+ */
+
+package com.pspdfkit.flutter.pspdfkit
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.net.Uri
+import com.pspdfkit.document.html.HtmlToPdfConverter
+import io.flutter.plugin.common.MethodChannel
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import java.io.File
+
+object PspdfkitHTMLConverter {
+
+    @JvmStatic
+    @SuppressLint("CheckResult")
+    fun generateFromHtmlString(
+        context: Context,
+        html: String,
+        outputFilePath: String,
+        options: Map<String, Any>?,
+        results: MethodChannel.Result
+    ) {
+        val outputFile = File(outputFilePath)// Output file for the converted PDF.
+
+        val converter = if (options?.contains("baseUrl") == true) HtmlToPdfConverter.fromHTMLString(
+            context,
+            html,
+            options["baseUrl"] as String
+        ) else HtmlToPdfConverter.fromHTMLString(context, html)
+
+        if (options?.contains("enableJavaScript") == true)
+            converter.setJavaScriptEnabled(options["enableJavaScript"] as Boolean)
+
+        if (options?.contains("documentTitle") == true)
+            converter.title(options["documentTitle"] as String)
+
+        converter
+            // Perform the conversion.
+            .convertToPdfAsync(outputFile)
+            .subscribeOn(Schedulers.io())
+            // Publish results on the main thread so we can update the UI.
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(
+                { results.success(outputFile.absolutePath) },
+                { results.error("HTML_TO_PDF_ERROR", it.message, null) })
+    }
+
+    @JvmStatic
+    @SuppressLint("CheckResult")
+    fun generateFromHtmlUri(
+        context: Context,
+        htmlUriString: String,
+        outputFilePath: String,
+        options: Map<String, Any>?,
+        results: MethodChannel.Result
+    ) {
+        val outputFile = File(outputFilePath)// Output file for the converted PDF.
+        val convertor = HtmlToPdfConverter.fromUri(context, Uri.parse(htmlUriString))
+
+        // Configure javascript enabled
+        if (options?.contains("enableJavaScript") == true)
+            convertor.setJavaScriptEnabled(options["enableJavaScript"] as Boolean)
+
+        // Configure title for the created document.
+        if (options?.contains("documentTitle") == true) convertor.title(options["documentTitle"] as String)
+
+        convertor
+            // Perform the conversion.
+            .convertToPdfAsync(outputFile)
+            // Subscribe to the conversion result.
+            .subscribe({
+                // Return the converted document.
+                results.success(outputFilePath)
+            }, {
+                // Handle the error.
+                results.error("Error converting HTML to PDF", it.message, null)
+            })
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.pspdfkit.flutter.pspdfkit
+
+import android.util.Log
+import com.pspdfkit.document.processor.PdfProcessor
+import com.pspdfkit.document.processor.PdfProcessorTask
+import com.pspdfkit.flutter.pspdfkit.pdfgeneration.PdfPageAdaptor
+import io.flutter.plugin.common.MethodChannel
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.Disposable
+import io.reactivex.schedulers.Schedulers
+import java.io.File
+
+class PspdfkitPdfGenerator(private val pageAdaptor: PdfPageAdaptor) {
+
+    var disposable: Disposable? = null
+
+    /**
+     * Creates a new [PdfProcessorTask] that can be used to process a PDF document.
+     */
+    fun generatePdf(
+        pages: List<HashMap<String, Any>>,
+        outputFilePath: String,
+        result: MethodChannel.Result
+    ) {
+
+        val documentPages = pageAdaptor.parsePages(pages)
+        val task = PdfProcessorTask.empty()
+
+        documentPages.forEachIndexed { index, newPage ->
+            task.addNewPage(newPage, index)
+        }
+
+        val outputFile = File(outputFilePath);
+        disposable = PdfProcessor
+            .processDocumentAsync(task, outputFile)
+            .subscribeOn(Schedulers.io())
+            // Publish results on the main thread so we can update the UI.
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                //Log progress
+                Log.d(
+                    "PDF Generation",
+                    "generatePdf: Processing page ${it.pagesProcessed + 1} of ${it.totalPages}"
+                )
+            }, {
+                // Handle the error.
+                result.error("Error generating PDF", it.message, null)
+            }, {
+                result.success(outputFilePath)
+            })
+    }
+
+    fun dispose() {
+        disposable?.dispose()
+        instance = null
+    }
+
+    companion object {
+
+        private var instance: PspdfkitPdfGenerator? = null
+
+        fun getInstance(pageAdaptor: PdfPageAdaptor): PspdfkitPdfGenerator {
+            if (instance == null) {
+                instance = PspdfkitPdfGenerator(pageAdaptor)
+            }
+            return instance!!
+        }
+    }
+}