mirror/BinaryEye
0
0
Fork 0
mirror of https://github.com/markusfisch/BinaryEye.git synced 2024-09-20 03:52:16 +02:00
Code

Replace properties with functions in Barcode

Browse Source 
We should only prefer read-only properties over of functions if the
underlying algorithm…

* does not throw
* is cheap to calculate (or cached on the first run)
* returns the same result over invocations if the object state
  hasn't changed

See:
https://kotlinlang.org/docs/coding-conventions.html#functions-vs-properties

But `ZXing.encodeAs*` may throw and may also not be that cheap to
calculate. So functions are a better fit here.

Also, because these functions will always return the same result,
it makes sense to cache their outputs.
This commit is contained in:
Markus Fisch 2022-11-02 21:49:08 +01:00
parent 32e936dd71
commit 9ccff808bc
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@ class BarcodeFragment : Fragment() {
"Illegal arguments"
)
// Catch exceptions from encoding.
bitmap = barcode.bitmap
bitmap = barcode.bitmap()
} catch (e: Exception) {
var message = e.message
if (message == null || message.isEmpty()) {
@ -132,7 +132,7 @@ class BarcodeFragment : Fragment() {
return when (item.itemId) {
R.id.copy_to_clipboard -> {
context.apply {
copyToClipboard(barcode.text)
copyToClipboard(barcode.text())
toast(R.string.copied_to_clipboard)
}
true
@ -184,19 +184,19 @@ class BarcodeFragment : Fragment() {
addSuffixIfNotGiven(fileName, ".png"),
MIME_PNG
) {
barcode.bitmap.saveAsPng(it)
barcode.bitmap().saveAsPng(it)
}
FileType.SVG -> saveAs(
addSuffixIfNotGiven(fileName, ".svg"),
MIME_SVG
) { outputStream ->
outputStream.write(barcode.svg.toByteArray())
outputStream.write(barcode.svg().toByteArray())
}
FileType.TXT -> saveAs(
addSuffixIfNotGiven(fileName, ".txt"),
MIME_TXT
) { outputStream ->
outputStream.write(barcode.text.toByteArray())
outputStream.write(barcode.text().toByteArray())
}
}
}
@ -221,9 +221,9 @@ class BarcodeFragment : Fragment() {
private fun Context.shareAs(fileType: FileType) {
when (fileType) {
FileType.PNG -> share(barcode.bitmap)
FileType.SVG -> shareText(barcode.svg, MIME_SVG)
FileType.TXT -> shareText(barcode.text)
FileType.PNG -> share(barcode.bitmap())
FileType.SVG -> shareText(barcode.svg(), MIME_SVG)
FileType.TXT -> shareText(barcode.text())
}
}
@ -288,21 +288,35 @@ private data class Barcode(
val ecLevel: Int,
val colors: Colors
) {
val bitmap: Bitmap
get() = ZxingCpp.encodeAsBitmap(
private var _bitmap: Bitmap? = null
fun bitmap(): Bitmap {
val b = _bitmap ?: ZxingCpp.encodeAsBitmap(
content, format, size, size, -1, ecLevel,
setColor = colors.foregroundColor(),
unsetColor = colors.backgroundColor()
)
val svg: String
get() = ZxingCpp.encodeAsSvg(
_bitmap = b
return b
}
private var _svg: String? = null
fun svg(): String {
val s = _svg ?: ZxingCpp.encodeAsSvg(
content, format, -1, ecLevel
)
val text: String
get() = ZxingCpp.encodeAsText(
_svg = s
return s
}
private var _text: String? = null
fun text(): String {
val t = _text ?: ZxingCpp.encodeAsText(
content, format, -1, ecLevel,
inverted = colors == Colors.BLACK_ON_WHITE
)
_text = t
return t
}
}
private enum class Colors {