Give EnumMap of encode hints to Zxing.encode()

Instead of transferring just the ErrorCorrectionLevel from the
EncodeFragment. This way we can transfer additional hints for
other Barcode formats too.

app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/BarcodeFragment.kt

@@ -9,7 +9,7 @@ import android.support.v4.app.Fragment
 import android.view.*
 import android.widget.EditText
 import com.google.zxing.BarcodeFormat
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
+import com.google.zxing.EncodeHintType
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.app.*
 import de.markusfisch.android.binaryeye.view.doOnApplyWindowInsets
@@ -60,14 +60,12 @@ class BarcodeFragment : Fragment() {
 		val args = arguments ?: return view
 		val content = args.getString(CONTENT) ?: return view
 		val format = args.getSerializable(FORMAT) as BarcodeFormat? ?: return view
-		val ecl = args.getSerializable(
+		val hints = args.getSerializable(HINTS) as EnumMap<EncodeHintType, Any>?
-			ERROR_CORRECTION_LEVEL
-		) as ErrorCorrectionLevel?
 		val size = args.getInt(SIZE)
 		try {
-			barcodeBitmap = Zxing.encodeAsBitmap(content, format, size, size, ecl)
+			barcodeBitmap = Zxing.encodeAsBitmap(content, format, size, size, hints)
-			barcodeSvg = Zxing.encodeAsSvg(content, format, size, size, ecl)
+			barcodeSvg = Zxing.encodeAsSvg(content, format, hints)
-			barcodeTxt = Zxing.encodeAsTxt(content, format, ecl)
+			barcodeTxt = Zxing.encodeAsText(content, format, hints)
 		} catch (e: Exception) {
 			var message = e.message
 			if (message == null || message.isEmpty()) {
@@ -235,7 +233,7 @@ class BarcodeFragment : Fragment() {
 	companion object {
 		private const val CONTENT = "content"
 		private const val FORMAT = "format"
-		private const val ERROR_CORRECTION_LEVEL = "error_correction_level"
+		private const val HINTS = "hints"
 		private const val SIZE = "size"
 		private const val MIME_PNG = "image/png"
 		private const val MIME_SVG = "image/svg+xmg"
@@ -245,13 +243,13 @@ class BarcodeFragment : Fragment() {
 			content: String,
 			format: BarcodeFormat,
 			size: Int,
-			errorCorrectionLevel: ErrorCorrectionLevel? = null
+			hints: EnumMap<EncodeHintType, Any>? = null
 		): Fragment {
 			val args = Bundle()
 			args.putString(CONTENT, content)
 			args.putSerializable(FORMAT, format)
-			errorCorrectionLevel?.let {
+			hints?.let {
-				args.putSerializable(ERROR_CORRECTION_LEVEL, it)
+				args.putSerializable(HINTS, it)
 			}
 			args.putInt(SIZE, size)
 			val fragment = BarcodeFragment()

app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/EncodeFragment.kt

@@ -7,12 +7,14 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.*
 import com.google.zxing.BarcodeFormat
+import com.google.zxing.EncodeHintType
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.app.addFragment
 import de.markusfisch.android.binaryeye.app.hideSoftKeyboard
 import de.markusfisch.android.binaryeye.app.prefs
 import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
+import java.util.*
 
 class EncodeFragment : Fragment() {
 	private lateinit var formatView: Spinner
@@ -122,16 +124,15 @@ class EncodeFragment : Fragment() {
 	}
 
 	private fun encode() {
+		val hints = EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
 		val format = writers[formatView.selectedItemPosition]
-		val ecl = if (format == BarcodeFormat.QR_CODE) {
+		if (format == BarcodeFormat.QR_CODE) {
-			arrayListOf(
+			hints[EncodeHintType.ERROR_CORRECTION] = arrayListOf(
 				ErrorCorrectionLevel.L,
 				ErrorCorrectionLevel.M,
 				ErrorCorrectionLevel.Q,
 				ErrorCorrectionLevel.H
 			)[errorCorrectionLevel.selectedItemPosition]
-		} else {
-			null
 		}
 		val size = getSize(sizeBarView.progress)
 		val content = contentView.text.toString()
@@ -145,7 +146,7 @@ class EncodeFragment : Fragment() {
 			activity?.hideSoftKeyboard(contentView)
 			addFragment(
 				fragmentManager,
-				BarcodeFragment.newInstance(content, format, size, ecl)
+				BarcodeFragment.newInstance(content, format, size, hints)
 			)
 		}
 	}

app/src/main/kotlin/de/markusfisch/android/binaryeye/zxing/Zxing.kt

@@ -2,8 +2,8 @@ package de.markusfisch.android.binaryeye.zxing
 
 import android.graphics.Bitmap
 import com.google.zxing.*
+import com.google.zxing.common.BitMatrix
 import com.google.zxing.common.HybridBinarizer
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
 import java.util.*
 
 class Zxing(possibleResultPoint: ResultPointCallback? = null) {
@@ -11,7 +11,7 @@ class Zxing(possibleResultPoint: ResultPointCallback? = null) {
 	private val multiFormatReader = MultiFormatReader()
 
 	init {
-		val decodeFormats = EnumSet.noneOf<BarcodeFormat>(
+		val decodeFormats = EnumSet.noneOf(
 			BarcodeFormat::class.java
 		)
 		decodeFormats.addAll(
@@ -129,27 +129,16 @@ class Zxing(possibleResultPoint: ResultPointCallback? = null) {
 			format: BarcodeFormat,
 			width: Int,
 			height: Int,
-			errorCorrectionLevel: ErrorCorrectionLevel? = null
+			hints: EnumMap<EncodeHintType, Any>? = null
 		): Bitmap? {
-			val hints = EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
+			val bitMatrix = encode(text, format, hints, width, height)
-			hints[EncodeHintType.CHARACTER_SET] = "utf-8"
+			val w = bitMatrix.width
-			errorCorrectionLevel?.let {
+			val h = bitMatrix.height
-				hints[EncodeHintType.ERROR_CORRECTION] = it
-			}
-			val result = MultiFormatWriter().encode(
-				text,
-				format,
-				width,
-				height,
-				hints
-			)
-			val w = result.width
-			val h = result.height
 			val pixels = IntArray(w * h)
 			var offset = 0
 			for (y in 0 until h) {
 				for (x in 0 until w) {
-					pixels[offset + x] = if (result.get(x, y)) {
+					pixels[offset + x] = if (bitMatrix.get(x, y)) {
 						BLACK
 					} else {
 						WHITE
@@ -165,30 +154,17 @@ class Zxing(possibleResultPoint: ResultPointCallback? = null) {
 		fun encodeAsSvg(
 			text: String,
 			format: BarcodeFormat,
-			width: Int,
+			hints: EnumMap<EncodeHintType, Any>? = null
-			height: Int,
-			errorCorrectionLevel: ErrorCorrectionLevel? = null
 		): String {
-			val hints = EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
+			val bitMatrix = encode(text, format, hints)
-			hints[EncodeHintType.CHARACTER_SET] = "utf-8"
-			errorCorrectionLevel?.let {
-				hints[EncodeHintType.ERROR_CORRECTION] = it
-			}
-			val result = MultiFormatWriter().encode(
-				text,
-				format,
-				0,
-				0,
-				hints
-			)
 			val sb = StringBuilder()
-			val w = result.width
+			val w = bitMatrix.width
-			var h = result.height
+			var h = bitMatrix.height
 			val moduleHeight = if (h == 1) w / 2 else 1
 			for (y in 0 until h) {
 				for (x in 0 until w) {
-					if (result.get(x, y)) {
+					if (bitMatrix.get(x, y)) {
-						sb.append(" M${x},${y}h1v${moduleHeight}h-1z");
+						sb.append(" M${x},${y}h1v${moduleHeight}h-1z")
 					}
 				}
 			}
@@ -196,38 +172,47 @@ class Zxing(possibleResultPoint: ResultPointCallback? = null) {
 			return """<svg width="$w" height="$h"
 viewBox="0 0 $w $h"
 xmlns="http://www.w3.org/2000/svg">
-<path d="${sb.toString()}"/>
+<path d="$sb"/>
 </svg>
 """
 		}
 
-		fun encodeAsTxt(
+		fun encodeAsText(
 			text: String,
 			format: BarcodeFormat,
-			errorCorrectionLevel: ErrorCorrectionLevel? = null
+			hints: EnumMap<EncodeHintType, Any>? = null
 		): String {
-			val hints = EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
+			val bitMatrix = encode(text, format, hints)
-			hints[EncodeHintType.CHARACTER_SET] = "utf-8"
+			val w = bitMatrix.width
-			errorCorrectionLevel?.let {
+			val h = bitMatrix.height
-				hints[EncodeHintType.ERROR_CORRECTION] = it
-			}
-			val result = MultiFormatWriter().encode(
-				text,
-				format,
-				0,
-				0,
-				hints
-			)
-			val w = result.width
-			val h = result.height
 			val sb = StringBuilder()
 			for (y in 0 until h) {
 				for (x in 0 until w) {
-					sb.append(if (result.get(x, y)) "█" else " ")
+					sb.append(if (bitMatrix.get(x, y)) "█" else " ")
 				}
 				sb.append("\n")
 			}
 			return sb.toString()
 		}
+
+		private fun encode(
+			text: String,
+			format: BarcodeFormat,
+			encodeHints: EnumMap<EncodeHintType, Any>? = null,
+			width: Int = 0,
+			height: Int = 0
+		): BitMatrix {
+			val hints = encodeHints ?: EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
+			if (!hints.contains(EncodeHintType.CHARACTER_SET)) {
+				hints[EncodeHintType.CHARACTER_SET] = "utf-8"
+			}
+			return MultiFormatWriter().encode(
+				text,
+				format,
+				width,
+				height,
+				hints
+			)
+		}
 	}
 }