expo-h3 0.1.4 → 0.1.5

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'expo.modules.h3'
-version = '0.1.4'
+version = '0.1.5'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -35,7 +35,7 @@ android {
   namespace "expo.modules.h3"
   defaultConfig {
     versionCode 1
-    versionName "0.1.4"
+    versionName "0.1.5"
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/h3/ExpoH3Module.kt

@@ -3,12 +3,23 @@ package expo.modules.h3
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import android.content.Intent
-import android.os.Handler
-import android.os.Looper
+import android.os.CancellationSignal
+import android.os.ParcelFileDescriptor
+import android.print.PageRange
+import android.print.PrintAttributes
+import android.print.PrintDocumentAdapter
+import android.print.PrintDocumentInfo
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import android.os.Handler
+import android.os.Looper
 import expo.modules.kotlin.Promise
 import java.io.File
+import java.io.IOException
+
+// Import the Java shim classes
+import expo.modules.h3.LayoutCallback
+import expo.modules.h3.WriteCallback
 
 class ExpoH3Module : Module() {
   override fun definition() = ModuleDefinition {
@@ -43,13 +54,50 @@ class ExpoH3Module : Module() {
     val pdfPath = "/storage/emulated/0/temp_print.pdf"
     val pdfFile = File(pdfPath)
     val context = appContext.reactContext!!.applicationContext
-    val attributes = android.print.PrintAttributes.Builder()
-        .setMediaSize(android.print.PrintAttributes.MediaSize.ISO_A4)
-        .setResolution(android.print.PrintAttributes.Resolution("pdf", "pdf", 600, 600))
-        .setMinMargins(android.print.PrintAttributes.Margins.NO_MARGINS)
+    try {
+      // Set up print attributes (A4, high res, no margins)
+      val attributes = PrintAttributes.Builder()
+        .setMediaSize(PrintAttributes.MediaSize.ISO_A4)
+        .setResolution(PrintAttributes.Resolution("pdf", "pdf", 600, 600))
+        .setMinMargins(PrintAttributes.Margins.NO_MARGINS)
         .build()
-    val adapter = webView.createPrintDocumentAdapter("SilentPrintDoc")
-    PrintHelper.printWebView(adapter, attributes, pdfFile, context, promise)
+      val adapter = webView.createPrintDocumentAdapter("SilentPrintDoc")
+      // Layout the document
+      adapter.onLayout(null, attributes, null, object : LayoutCallback() {
+        override fun onLayoutFinished(info: PrintDocumentInfo?, changed: Boolean) {
+          // Write to file
+          val fd = ParcelFileDescriptor.open(pdfFile, ParcelFileDescriptor.MODE_READ_WRITE)
+          adapter.onWrite(arrayOf(PageRange.ALL_PAGES), fd, CancellationSignal(), object : WriteCallback() {
+            override fun onWriteFinished(pages: Array<out PageRange>?) {
+              try {
+                fd.close()
+                // Now send the print intent
+                val intent = Intent()
+                intent.action = Intent.ACTION_SEND
+                intent.setPackage("comb.bld.settings.print")
+                intent.putExtra(Intent.EXTRA_TEXT, pdfPath)
+                intent.type = "application/pdf"
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                context.startActivity(intent)
+                // Delete the temp file (assume print service has it now; add delay if needed for testing)
+                pdfFile.delete()
+                promise.resolve("Printed successfully")
+              } catch (e: Exception) {
+                promise.reject("PRINT_ERROR", e.message, e)
+              }
+            }
+            override fun onWriteFailed(error: CharSequence?) {
+              promise.reject("PDF_WRITE_ERROR", error.toString(), null)
+            }
+          })
+        }
+        override fun onLayoutFailed(error: CharSequence?) {
+          promise.reject("PDF_LAYOUT_ERROR", error.toString(), null)
+        }
+      }, null)
+    } catch (e: IOException) {
+      promise.reject("FILE_ERROR", e.message, e)
+    }
   }
   private fun sendPrintIntent(content: String, mimeType: String, promise: Promise) {
     val context = appContext.reactContext!!.applicationContext

package/android/src/main/java/expo/modules/h3/PrintCallbacks.java

@@ -0,0 +1,15 @@
+package expo.modules.h3;
+
+import android.print.PrintDocumentAdapter;
+
+public abstract class LayoutCallback extends PrintDocumentAdapter.LayoutResultCallback {
+    public LayoutCallback() {
+        // Implicitly calls super(); javac allows this despite package-private access.
+    }
+}
+
+public abstract class WriteCallback extends PrintDocumentAdapter.WriteResultCallback {
+    public WriteCallback() {
+        // Implicitly calls super(); javac allows this.
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-h3",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "My new module",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/android/src/main/java/expo/modules/h3/PrintHelper.java

@@ -1,72 +0,0 @@
-package expo.modules.h3;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.CancellationSignal;
-import android.os.ParcelFileDescriptor;
-import android.print.PageRange;
-import android.print.PrintAttributes;
-import android.print.PrintDocumentAdapter;
-import android.print.PrintDocumentInfo;
-
-import expo.modules.kotlin.Promise;
-
-import java.io.File;
-import java.io.IOException;
-
-public class PrintHelper {
-    public static void printWebView(PrintDocumentAdapter adapter, PrintAttributes attributes, File pdfFile, Context context, Promise promise) {
-        adapter.onLayout(null, attributes, null, new PrintDocumentAdapter.LayoutResultCallback() {
-            @Override
-            public void onLayoutFinished(PrintDocumentInfo info, boolean changed) {
-                ParcelFileDescriptor fd = null;
-                try {
-                    fd = ParcelFileDescriptor.open(pdfFile, ParcelFileDescriptor.MODE_READ_WRITE);
-                    adapter.onWrite(new PageRange[]{PageRange.ALL_PAGES}, fd, new CancellationSignal(), new PrintDocumentAdapter.WriteResultCallback() {
-                        @Override
-                        public void onWriteFinished(PageRange[] pages) {
-                            try {
-                                if (fd != null) {
-                                    fd.close();
-                                }
-                                // Now send the print intent
-                                Intent intent = new Intent();
-                                intent.setAction(Intent.ACTION_SEND);
-                                intent.setPackage("comb.bld.settings.print");
-                                intent.putExtra(Intent.EXTRA_TEXT, pdfFile.getAbsolutePath());
-                                intent.setType("application/pdf");
-                                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                context.startActivity(intent);
-                                // Delete the temp file (assume print service has it now; add delay if needed for testing)
-                                pdfFile.delete();
-                                promise.resolve("Printed successfully");
-                            } catch (Exception e) {
-                                promise.reject("PRINT_ERROR", e.getMessage(), e);
-                            }
-                        }
-
-                        @Override
-                        public void onWriteFailed(CharSequence error) {
-                            promise.reject("PDF_WRITE_ERROR", error != null ? error.toString() : "Unknown error", null);
-                        }
-                    });
-                } catch (IOException e) {
-                    promise.reject("FILE_ERROR", e.getMessage(), e);
-                } finally {
-                    if (fd != null) {
-                        try {
-                            fd.close();
-                        } catch (IOException e) {
-                            // Ignore
-                        }
-                    }
-                }
-            }
-
-            @Override
-            public void onLayoutFailed(CharSequence error) {
-                promise.reject("PDF_LAYOUT_ERROR", error != null ? error.toString() : "Unknown error", null);
-            }
-        }, null);
-    }
-}