Skip to content

Commit 9f62cae

Browse files
committed
[GH-4] Release 1.2.1
1 parent 4ebdaec commit 9f62cae

File tree

7 files changed

+470
-543
lines changed

7 files changed

+470
-543
lines changed

README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ and customizable way to create QRCodes into the JVM domain, especially in the ba
2424

2525
## Installation
2626

27-
This library is available from [Maven Central](https://search.maven.org/artifact/io.github.g0dkar/qrcode-kotlin/1.2.0/qrcode-kotlin)
27+
This library is available from [Maven Central](https://search.maven.org/artifact/io.github.g0dkar/qrcode-kotlin/1.2.1/qrcode-kotlin)
2828
so you can add `QRCode-Kotlin` to your project as a dependency like any other:
2929

3030
**If you're using Maven - pom.xml:**
@@ -33,18 +33,18 @@ so you can add `QRCode-Kotlin` to your project as a dependency like any other:
3333
<dependency>
3434
<groupId>io.github.g0dkar</groupId>
3535
<artifactId>qrcode-kotlin</artifactId>
36-
<version>1.2.0</version>
36+
<version>1.2.1</version>
3737
</dependency>
3838
```
3939

4040
**If you're using Gradle:**
4141

4242
```groovy
4343
// Kotlin ❤️
44-
implementation("io.github.g0dkar:qrcode-kotlin:1.2.0")
44+
implementation("io.github.g0dkar:qrcode-kotlin:1.2.1")
4545
4646
// Groovy
47-
implementation 'io.github.g0dkar:qrcode-kotlin:1.2.0'
47+
implementation 'io.github.g0dkar:qrcode-kotlin:1.2.1'
4848
```
4949

5050
## Examples and Usage
@@ -235,7 +235,7 @@ personalizável de se criar QRCodes para o domínio da JVM, especialmente no bac
235235

236236
## Instalação
237237

238-
Esta biblioteca está disponível a partir da [Central Maven](https://search.maven.org/artifact/io.github.g0dkar/qrcode-kotlin/1.2.0/qrcode-kotlin),
238+
Esta biblioteca está disponível a partir da [Central Maven](https://search.maven.org/artifact/io.github.g0dkar/qrcode-kotlin/1.2.1/qrcode-kotlin),
239239
então basta adicionar o `QRCode-Kotlin` a seu projeto como qualquer outra dependência:
240240

241241
**Se você utiliza Maven - pom.xml:**
@@ -244,18 +244,18 @@ então basta adicionar o `QRCode-Kotlin` a seu projeto como qualquer outra depen
244244
<dependency>
245245
<groupId>io.github.g0dkar</groupId>
246246
<artifactId>qrcode-kotlin</artifactId>
247-
<version>1.2.0</version>
247+
<version>1.2.1</version>
248248
</dependency>
249249
```
250250

251251
**Se você utiliza Gradle:**
252252

253253
```groovy
254254
// Kotlin ❤️
255-
implementation("io.github.g0dkar:qrcode-kotlin:1.2.0")
255+
implementation("io.github.g0dkar:qrcode-kotlin:1.2.1")
256256
257257
// Groovy
258-
implementation 'io.github.g0dkar:qrcode-kotlin:1.2.0'
258+
implementation 'io.github.g0dkar:qrcode-kotlin:1.2.1'
259259
```
260260

261261
## Exemplos e Usos

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212
}
1313

1414
group = "io.github.g0dkar"
15-
version = "1.2.0"
15+
version = "1.2.1"
1616

1717
java {
1818
sourceCompatibility = JavaVersion.VERSION_1_8

src/main/kotlin/io/github/g0dkar/qrcode/QRCode.kt

+3-29
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package io.github.g0dkar.qrcode
22

3-
import io.github.g0dkar.qrcode.QRCodeDataType.UPPER_ALPHA_NUM
43
import io.github.g0dkar.qrcode.QRCodeDataType.DEFAULT
54
import io.github.g0dkar.qrcode.QRCodeDataType.KANJI
65
import io.github.g0dkar.qrcode.QRCodeDataType.NUMBERS
6+
import io.github.g0dkar.qrcode.QRCodeDataType.UPPER_ALPHA_NUM
77
import io.github.g0dkar.qrcode.internals.BitBuffer
8-
import io.github.g0dkar.qrcode.internals.Helper.saveState
98
import io.github.g0dkar.qrcode.internals.Polynomial
109
import io.github.g0dkar.qrcode.internals.QR8BitByte
1110
import io.github.g0dkar.qrcode.internals.QRAlphaNum
@@ -16,7 +15,6 @@ import io.github.g0dkar.qrcode.internals.QRUtil
1615
import io.github.g0dkar.qrcode.internals.RSBlock
1716
import java.awt.Color
1817
import java.awt.image.BufferedImage
19-
import java.util.StringJoiner
2018
import java.util.function.Function
2119
import javax.imageio.ImageIO
2220

@@ -243,38 +241,25 @@ class QRCode @JvmOverloads constructor(
243241
): Array<Array<Boolean?>> {
244242
val moduleCount = type * 4 + 17
245243
val modules: Array<Array<Boolean?>> = Array(moduleCount) { Array(moduleCount) { null } }
246-
saveState("test-01A", modules)
247244

248245
setupPositionProbePattern(0, 0, moduleCount, modules)
249-
saveState("test-02A", modules)
250246
setupPositionProbePattern(moduleCount - 7, 0, moduleCount, modules)
251-
saveState("test-03A", modules)
252247
setupPositionProbePattern(0, moduleCount - 7, moduleCount, modules)
253-
saveState("test-04A", modules)
254248

255249
setupPositionAdjustPattern(type, modules)
256-
saveState("test-05A", modules)
257250
setupTimingPattern(moduleCount, modules)
258-
saveState("test-06A", modules)
259251
setupTypeInfo(maskPattern, moduleCount, modules)
260-
saveState("test-07A", modules)
261252

262253
if (type >= 7) {
263254
setupTypeNumber(type, moduleCount, modules)
264255
}
265-
saveState("test-08A", modules)
266256

267257
val data = createData(type)
268258
val data2 = data.copyOf()
269259
val modules2 = modules.copyOf()
270260

271-
saveState("test-09A", modules)
272-
273261
applyMaskPattern(data, maskPattern, moduleCount, modules)
274-
saveState("test-10A", modules)
275-
276262
mapData(data2, maskPattern, modules2)
277-
saveState("test-10AA", modules2)
278263

279264
return modules
280265
}
@@ -378,7 +363,6 @@ class QRCode @JvmOverloads constructor(
378363
buffer.put(qrCodeData.length(), qrCodeData.getLengthInBits(type))
379364
qrCodeData.write(buffer)
380365

381-
382366
val totalDataCount = rsBlocks.sumOf { it.dataCount } * 8
383367

384368
if (buffer.lengthInBits > totalDataCount) {
@@ -484,14 +468,12 @@ class QRCode @JvmOverloads constructor(
484468
if (modules[row][col - c] == null) {
485469
modules[row][col - c] = if (byteIndex < data.size) {
486470
(data[byteIndex] ushr bitIndex) and 1 == 1
487-
}
488-
else {
471+
} else {
489472
false
490473
}.let {
491474
if (QRUtil.getMask(maskPattern, row, col - c)) {
492475
!it
493-
}
494-
else {
476+
} else {
495477
it
496478
}
497479
}
@@ -574,12 +556,4 @@ class QRCode @JvmOverloads constructor(
574556

575557
private fun isDark(row: Int, col: Int, modules: Array<Array<Boolean?>>): Boolean =
576558
modules[row][col] ?: false
577-
578-
override fun toString(): String =
579-
StringJoiner(", ", QRCode.javaClass.simpleName + "[", "]")
580-
.add("data=$data")
581-
.add("dataType=$dataType")
582-
.add("qrCodeData=$qrCodeData")
583-
.add("errorCorrectionLevel=$errorCorrectionLevel")
584-
.toString()
585559
}

src/main/kotlin/io/github/g0dkar/qrcode/internals/Helper.kt

-38
This file was deleted.

src/main/kotlin/io/github/g0dkar/qrcode/internals/QRData.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.github.g0dkar.qrcode.internals
22

33
import io.github.g0dkar.qrcode.QRCodeDataType
4-
import io.github.g0dkar.qrcode.QRCodeDataType.UPPER_ALPHA_NUM
54
import io.github.g0dkar.qrcode.QRCodeDataType.DEFAULT
65
import io.github.g0dkar.qrcode.QRCodeDataType.KANJI
76
import io.github.g0dkar.qrcode.QRCodeDataType.NUMBERS
7+
import io.github.g0dkar.qrcode.QRCodeDataType.UPPER_ALPHA_NUM
88
import java.lang.Integer.parseInt
99
import java.lang.Integer.toHexString
1010

0 commit comments

Comments
 (0)