David PHAM-VAN

Allow building for Android SDK 16

... ... @@ -3,6 +3,7 @@
## 3.5.0
- Add decoration options to the PdfPreview Widget [Marcos Rodriguez]
- Allow building for Android SDK 16
## 3.4.0
... ...
... ... @@ -25,7 +25,7 @@ android {
compileSdkVersion 28
defaultConfig {
minSdkVersion 19
minSdkVersion 16
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
lintOptions {
... ...
... ... @@ -14,7 +14,7 @@ public class PrintingHandler implements MethodChannel.MethodCallHandler {
private final Activity activity;
private final MethodChannel channel;
public PrintingHandler(@NonNull Activity activity, @NonNull MethodChannel channel) {
PrintingHandler(@NonNull Activity activity, @NonNull MethodChannel channel) {
this.activity = activity;
this.channel = channel;
}
... ... @@ -34,8 +34,7 @@ public class PrintingHandler implements MethodChannel.MethodCallHandler {
final PrintingJob printJob =
new PrintingJob(activity, this, (int) call.argument("job"));
assert name != null;
printJob.printPdf(
name, width, height, marginLeft, marginTop, marginRight, marginBottom);
printJob.printPdf(name);
result.success(1);
break;
... ...
... ... @@ -73,13 +73,16 @@ public class PrintingJob extends PrintDocumentAdapter {
}
static HashMap<String, Object> printingInfo() {
final boolean canPrint = android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
final boolean canRaster = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
HashMap<String, Object> result = new HashMap<>();
result.put("directPrint", false);
result.put("dynamicLayout", true);
result.put("canPrint", true);
result.put("canConvertHtml", true);
result.put("dynamicLayout", canPrint);
result.put("canPrint", canPrint);
result.put("canConvertHtml", canRaster);
result.put("canShare", true);
result.put("canRaster", true);
result.put("canRaster", canRaster);
return result;
}
... ... @@ -181,8 +184,7 @@ public class PrintingJob extends PrintDocumentAdapter {
thread.start();
}
void printPdf(@NonNull String name, Double width, Double height, Double marginLeft,
Double marginTop, Double marginRight, Double marginBottom) {
void printPdf(@NonNull String name) {
jobName = name;
printJob = printManager.print(name, this, null);
}
... ...
... ... @@ -17,22 +17,14 @@
package net.nfet.flutter.printing;
import android.app.Activity;
import android.content.Context;
import android.print.PrintAttributes;
import androidx.annotation.NonNull;
import java.util.HashMap;
import io.flutter.embedding.engine.plugins.FlutterPlugin;
import io.flutter.embedding.engine.plugins.activity.ActivityAware;
import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
import io.flutter.plugin.common.BinaryMessenger;
import io.flutter.plugin.common.EventChannel;
import io.flutter.plugin.common.MethodCall;
import io.flutter.plugin.common.MethodChannel;
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
import io.flutter.plugin.common.MethodChannel.Result;
import io.flutter.plugin.common.PluginRegistry.Registrar;
/**
... ... @@ -73,7 +65,7 @@ public class PrintingPlugin implements FlutterPlugin, ActivityAware {
}
@Override
public void onDetachedFromEngine(FlutterPluginBinding binding) {
public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
channel.setMethodCallHandler(null);
channel = null;
handler = null;
... ...