From 09c13c833eedb7cb9f0b1f74a2b1937f2760dd09 Mon Sep 17 00:00:00 2001
From: Rafael Lins <nihillus@duck.com>
Date: Thu, 9 Nov 2023 23:37:53 -0300
Subject: [PATCH] [4.0.4] Android drawing is different from the rest, Fixes #88

---
 build.gradle.kts                              | 11 ++-
 .../io/github/g0dkar/qrcode/AboutActivity.kt  | 11 +++
 .../github/g0dkar/qrcode/NewQRCodeActivity.kt | 85 ++++++++++++++++++
 .../io/github/g0dkar/qrcode/QRCodeData.kt     | 20 +++++
 .../g0dkar/qrcode/QRCodeDetailActivity.kt     | 49 ++++++++++
 .../g0dkar/qrcode/QRCodeListActivity.kt       | 89 +++++++++++++++++++
 .../g0dkar/qrcode/extra/QRCodeListAdapter.kt  | 63 +++++++++++++
 .../qrcode/extra/QRCodeListDatasource.kt      | 67 ++++++++++++++
 .../drawable-v24/ic_launcher_foreground.xml   | 31 +++++++
 .../src/main/res/layout/activity_about.xml    | 22 +++++
 .../src/main/res/layout/activity_main.xml     | 40 +++++++++
 .../main/res/layout/activity_new_qrcode.xml   | 49 ++++++++++
 .../res/layout/activity_qrcode_detail.xml     | 45 ++++++++++
 .../src/main/res/layout/qrcode_list_item.xml  | 45 ++++++++++
 .../android/src/main/res/menu/menu_main.xml   | 11 +++
 .../src/main/res/values-pt-rBR/strings.xml    | 16 ++++
 .../android/src/main/res/xml/backup_rules.xml | 14 +++
 .../main/res/xml/data_extraction_rules.xml    | 20 +++++
 .../main/java/examples/Example01_Shapes.java  | 10 +--
 .../main/java/examples/Example02_Colors.java  |  8 +-
 .../src/main/java/examples/Example03_SVG.java |  6 +-
 .../src/main/kotlin/Example01-Shapes.kt       | 14 +--
 .../src/main/kotlin/Example02-Colors.kt       |  8 +-
 .../kotlin/src/main/kotlin/Example03-Logo.kt  |  4 +-
 .../kotlin/src/main/kotlin/Example04-SVG.kt   |  6 +-
 .../main/kotlin/Example05-BackwardsCompat.kt  | 16 ++++
 .../kotlin/src/main/kotlin/ProjectLogo.kt     |  4 +-
 gradle.properties                             |  2 +
 gradle/libs.versions.toml                     | 22 ++++-
 settings.gradle.kts                           |  2 +-
 .../qrcode/render/QRCodeGraphics.android.kt   | 59 +++++++-----
 src/commonMain/kotlin/qrcode/QRCode.kt        | 12 +--
 src/commonMain/kotlin/qrcode/QRCodeBuilder.kt |  2 +-
 .../kotlin/qrcode/color/ColorType.kt          |  3 +
 .../qrcode/render/QRCodeGraphics.jvm.kt       |  1 -
 .../kotlin/qrcode/raw/QRCodeProcessorTest.kt  | 62 +++++++++++++
 36 files changed, 861 insertions(+), 68 deletions(-)
 create mode 100644 examples/android/src/main/java/io/github/g0dkar/qrcode/AboutActivity.kt
 create mode 100644 examples/android/src/main/java/io/github/g0dkar/qrcode/NewQRCodeActivity.kt
 create mode 100644 examples/android/src/main/java/io/github/g0dkar/qrcode/QRCodeData.kt
 create mode 100644 examples/android/src/main/java/io/github/g0dkar/qrcode/QRCodeDetailActivity.kt
 create mode 100644 examples/android/src/main/java/io/github/g0dkar/qrcode/QRCodeListActivity.kt
 create mode 100644 examples/android/src/main/java/io/github/g0dkar/qrcode/extra/QRCodeListAdapter.kt
 create mode 100644 examples/android/src/main/java/io/github/g0dkar/qrcode/extra/QRCodeListDatasource.kt
 create mode 100644 examples/android/src/main/res/drawable-v24/ic_launcher_foreground.xml
 create mode 100644 examples/android/src/main/res/layout/activity_about.xml
 create mode 100644 examples/android/src/main/res/layout/activity_main.xml
 create mode 100644 examples/android/src/main/res/layout/activity_new_qrcode.xml
 create mode 100644 examples/android/src/main/res/layout/activity_qrcode_detail.xml
 create mode 100644 examples/android/src/main/res/layout/qrcode_list_item.xml
 create mode 100644 examples/android/src/main/res/menu/menu_main.xml
 create mode 100644 examples/android/src/main/res/values-pt-rBR/strings.xml
 create mode 100644 examples/android/src/main/res/xml/backup_rules.xml
 create mode 100644 examples/android/src/main/res/xml/data_extraction_rules.xml
 create mode 100644 examples/kotlin/src/main/kotlin/Example05-BackwardsCompat.kt
 create mode 100644 src/commonMain/kotlin/qrcode/color/ColorType.kt
 create mode 100644 src/jvmTest/kotlin/qrcode/raw/QRCodeProcessorTest.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 75a8b4b9..19f23145 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,6 +29,10 @@ plugins {
 
     // Docs Plugins
     alias(libs.plugins.dokka)
+
+    // Here because of the Android Examples
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
 }
 
 repositories {
@@ -41,7 +45,7 @@ val javaVersion = JavaVersion.VERSION_17
 val javaVersionNumber = javaVersion.majorVersion.toInt()
 
 kotlin {
-    applyDefaultHierarchyTemplate()
+    //applyDefaultHierarchyTemplate()
 
     jvm {
         jvmToolchain(javaVersionNumber)
@@ -53,7 +57,8 @@ kotlin {
         }
     }
 
-    androidTarget {
+    android {
+//    androidTarget {
         jvmToolchain(javaVersionNumber)
         publishLibraryVariants("release")
     }
@@ -69,7 +74,6 @@ kotlin {
             commonWebpackConfig {
                 mode = PRODUCTION
                 sourceMaps = true
-//                output?.library = "qrcodeKotlin"
             }
 
             testTask {
@@ -77,7 +81,6 @@ kotlin {
             }
 
             binaries.library()
-//            binaries.executable()
             generateTypeScriptDefinitions()
         }
     }
diff --git a/examples/android/src/main/java/io/github/g0dkar/qrcode/AboutActivity.kt b/examples/android/src/main/java/io/github/g0dkar/qrcode/AboutActivity.kt
new file mode 100644
index 00000000..ed89f1c4
--- /dev/null
+++ b/examples/android/src/main/java/io/github/g0dkar/qrcode/AboutActivity.kt
@@ -0,0 +1,11 @@
+package io.github.g0dkar.qrcode
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+
+class AboutActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_about)
+    }
+}
diff --git a/examples/android/src/main/java/io/github/g0dkar/qrcode/NewQRCodeActivity.kt b/examples/android/src/main/java/io/github/g0dkar/qrcode/NewQRCodeActivity.kt
new file mode 100644
index 00000000..23b6a051
--- /dev/null
+++ b/examples/android/src/main/java/io/github/g0dkar/qrcode/NewQRCodeActivity.kt
@@ -0,0 +1,85 @@
+package io.github.g0dkar.qrcode
+
+import android.content.Intent
+import android.graphics.Bitmap
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.widget.Button
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.os.postDelayed
+import androidx.core.widget.doOnTextChanged
+import qrcode.QRCode
+
+class NewQRCodeActivity : AppCompatActivity() {
+    private lateinit var qrCodeData: EditText
+    private lateinit var qrCodeImageView: ImageView
+    private lateinit var saveButton: Button
+    private var qrCodeIsValid = false
+
+    private val handler = Handler(Looper.getMainLooper())
+
+    companion object {
+        const val QRCODE_DATA = "qrCodeData"
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_new_qrcode)
+
+        qrCodeData = findViewById(R.id.newQRCodeData)
+        qrCodeImageView = findViewById(R.id.newQRCodePreviewImage)
+        saveButton = findViewById(R.id.newQRCodeBtn)
+
+        qrCodeData.doOnTextChanged { text, _, _, _ ->
+            val string = text?.toString()?.trim()
+
+            qrCodeIsValid = if (string.isNullOrBlank()) {
+                qrCodeImageView.setImageBitmap(null)
+
+                false
+            } else {
+                try {
+                    handler.removeCallbacksAndMessages(null)
+                    handler.postDelayed(250) {
+                        val qrCodeBitmap = QRCode(string).render().nativeImage() as Bitmap
+                        qrCodeImageView.setImageBitmap(qrCodeBitmap)
+                    }
+
+                    true
+                } catch (t: Throwable) {
+                    Toast.makeText(
+                        this@NewQRCodeActivity,
+                        R.string.new_qrcode_error_preview,
+                        Toast.LENGTH_LONG,
+                    ).show()
+
+                    qrCodeImageView.setImageBitmap(null)
+
+                    false
+                }
+            }
+        }
+
+        saveButton.setOnClickListener {
+            save()
+        }
+    }
+
+    private fun save() {
+        val resultIntent = Intent()
+        val qrCodeDataText = qrCodeData.text.toString()
+
+        if (qrCodeDataText.isBlank() || !qrCodeIsValid) {
+            setResult(RESULT_CANCELED, resultIntent)
+        } else {
+            resultIntent.putExtra(QRCODE_DATA, qrCodeDataText)
+            setResult(RESULT_OK, resultIntent)
+        }
+
+        finish()
+    }
+}
diff --git a/examples/android/src/main/java/io/github/g0dkar/qrcode/QRCodeData.kt b/examples/android/src/main/java/io/github/g0dkar/qrcode/QRCodeData.kt
new file mode 100644
index 00000000..39707660
--- /dev/null
+++ b/examples/android/src/main/java/io/github/g0dkar/qrcode/QRCodeData.kt
@@ -0,0 +1,20 @@
+package io.github.g0dkar.qrcode
+
+import android.content.SharedPreferences
+import android.graphics.Bitmap
+import qrcode.QRCode
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+
+data class QRCodeData(
+    val data: String,
+    val timestamp: OffsetDateTime = OffsetDateTime.now(ZoneOffset.UTC),
+    val bitmap: Bitmap = QRCode(data).render().nativeImage() as Bitmap,
+) : Comparable<QRCodeData> {
+    fun persist(sharedPreferencesEditor: SharedPreferences.Editor) {
+        val key = timestamp.toEpochSecond().toString()
+        sharedPreferencesEditor.putString(key, data)
+    }
+
+    override fun compareTo(other: QRCodeData): Int = timestamp.compareTo(other.timestamp)
+}
diff --git a/examples/android/src/main/java/io/github/g0dkar/qrcode/QRCodeDetailActivity.kt b/examples/android/src/main/java/io/github/g0dkar/qrcode/QRCodeDetailActivity.kt
new file mode 100644
index 00000000..8037d482
--- /dev/null
+++ b/examples/android/src/main/java/io/github/g0dkar/qrcode/QRCodeDetailActivity.kt
@@ -0,0 +1,49 @@
+package io.github.g0dkar.qrcode
+
+import android.os.Bundle
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import java.time.Instant
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+
+class QRCodeDetailActivity : AppCompatActivity() {
+    companion object {
+        const val QRCODE_DATA = "qrCodeData"
+        const val QRCODE_TIMESTAMP = "qrCodeTimestamp"
+    }
+
+    private lateinit var qrCodeDetailText: TextView
+    private lateinit var qrCodeDetailImage: ImageView
+    private lateinit var qrCodeDetailFab: View
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_qrcode_detail)
+
+        qrCodeDetailText = findViewById(R.id.qrCodeDetailText)
+        qrCodeDetailImage = findViewById(R.id.qrCodeDetailImage)
+        qrCodeDetailFab = findViewById(R.id.qrCodeDetailFab)
+
+        setBrightness()
+
+        val qrCodeData = intent.getStringExtra(QRCODE_DATA) ?: "ERROR"
+        val qrCodeTimestamp = intent.getLongExtra(QRCODE_TIMESTAMP, Instant.now().epochSecond)
+        val qrCode = QRCodeData(qrCodeData, OffsetDateTime.ofInstant(Instant.ofEpochSecond(qrCodeTimestamp), ZoneOffset.UTC))
+
+        qrCodeDetailText.text = qrCode.data
+        qrCodeDetailImage.setImageBitmap(qrCode.bitmap)
+    }
+
+    private fun setBrightness() {
+        try {
+            val layout = window.attributes
+            layout.screenBrightness = 1.0f
+            window.attributes = layout
+        } catch (_: Exception) {
+            // NOOP
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/android/src/main/java/io/github/g0dkar/qrcode/QRCodeListActivity.kt b/examples/android/src/main/java/io/github/g0dkar/qrcode/QRCodeListActivity.kt
new file mode 100644
index 00000000..e2e07b47
--- /dev/null
+++ b/examples/android/src/main/java/io/github/g0dkar/qrcode/QRCodeListActivity.kt
@@ -0,0 +1,89 @@
+package io.github.g0dkar.qrcode
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView
+import io.github.g0dkar.qrcode.NewQRCodeActivity.Companion.QRCODE_DATA
+import io.github.g0dkar.qrcode.extra.QRCodeListAdapter
+import io.github.g0dkar.qrcode.extra.QRCodeListDatasource
+
+class QRCodeListActivity : AppCompatActivity() {
+    private val listAdapter = QRCodeListAdapter {
+        val intent = Intent(this@QRCodeListActivity, QRCodeDetailActivity::class.java)
+        intent.putExtra(QRCodeDetailActivity.QRCODE_DATA, it.data)
+        intent.putExtra(QRCodeDetailActivity.QRCODE_TIMESTAMP, it.timestamp.toEpochSecond())
+        startActivity(intent)
+    }
+
+    private lateinit var recyclerView: RecyclerView
+    private lateinit var fab: View
+    private lateinit var newQRCodeActivity: ActivityResultLauncher<Intent>
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        fab = findViewById(R.id.fab)
+        recyclerView = findViewById(R.id.recycler_view)
+
+        QRCodeListDatasource.fromContext(this)
+
+        recyclerView.adapter = listAdapter
+
+        fab.setOnClickListener {
+            startNewQRCodeActivity()
+        }
+
+        newQRCodeActivity = registerForActivityResult(StartActivityForResult()) {
+            if (it.data != null) {
+                val result = it.resultCode
+
+                if (result == RESULT_OK) {
+                    val qrCodeData = it.data?.getStringExtra(QRCODE_DATA)
+
+                    if (qrCodeData != null) {
+                        QRCodeListDatasource.add(qrCodeData)
+                    } else {
+                        Toast.makeText(
+                            this@QRCodeListActivity,
+                            R.string.new_qrcode_error,
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
+                } else {
+                    Toast.makeText(
+                        this@QRCodeListActivity,
+                        R.string.new_qrcode_error,
+                        Toast.LENGTH_LONG
+                    ).show()
+                }
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        QRCodeListDatasource.liveData.observe(this) {
+            if (it != null) {
+                listAdapter.submitList(it)
+            }
+        }
+    }
+
+    override fun onStop() {
+        super.onStop()
+
+        QRCodeListDatasource.liveData.removeObservers(this)
+    }
+
+    private fun startNewQRCodeActivity() {
+        val intent = Intent(this, NewQRCodeActivity::class.java)
+        newQRCodeActivity.launch(intent)
+    }
+}
diff --git a/examples/android/src/main/java/io/github/g0dkar/qrcode/extra/QRCodeListAdapter.kt b/examples/android/src/main/java/io/github/g0dkar/qrcode/extra/QRCodeListAdapter.kt
new file mode 100644
index 00000000..1fcf8eb7
--- /dev/null
+++ b/examples/android/src/main/java/io/github/g0dkar/qrcode/extra/QRCodeListAdapter.kt
@@ -0,0 +1,63 @@
+package io.github.g0dkar.qrcode.extra
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import io.github.g0dkar.qrcode.QRCodeData
+import io.github.g0dkar.qrcode.R
+
+class QRCodeListAdapter(
+    private val onClick: (QRCodeData) -> Unit
+) : ListAdapter<QRCodeData, QRCodeListViewHolder>(QRCodeListDiffCallback) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QRCodeListViewHolder {
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.qrcode_list_item, parent, false)
+        return QRCodeListViewHolder(view, onClick)
+    }
+
+    override fun onBindViewHolder(holder: QRCodeListViewHolder, position: Int) {
+        val qrCodeData = getItem(position)
+        holder.bind(qrCodeData)
+    }
+
+}
+
+class QRCodeListViewHolder(
+    itemView: View,
+    val onClick: (QRCodeData) -> Unit
+) : RecyclerView.ViewHolder(itemView) {
+    private val qrCodeListItemTextView: TextView = itemView.findViewById(R.id.qrcode_data)
+    private val qrCodeListItemImageView: ImageView = itemView.findViewById(R.id.qrcode_image)
+    private var currentQrCodeData: QRCodeData? = null
+
+    init {
+        itemView.setOnClickListener {
+            currentQrCodeData?.let {
+                onClick(it)
+            }
+        }
+    }
+
+    fun bind(qrCodeData: QRCodeData) {
+        currentQrCodeData = qrCodeData
+
+        qrCodeListItemTextView.text = qrCodeData.data
+        qrCodeListItemImageView.setImageBitmap(qrCodeData.bitmap)
+    }
+}
+
+object QRCodeListDiffCallback : DiffUtil.ItemCallback<QRCodeData>() {
+    override fun areItemsTheSame(oldItem: QRCodeData, newItem: QRCodeData): Boolean {
+        return oldItem == newItem
+    }
+
+    override fun areContentsTheSame(oldItem: QRCodeData, newItem: QRCodeData): Boolean {
+        return oldItem.data == newItem.data
+    }
+}
diff --git a/examples/android/src/main/java/io/github/g0dkar/qrcode/extra/QRCodeListDatasource.kt b/examples/android/src/main/java/io/github/g0dkar/qrcode/extra/QRCodeListDatasource.kt
new file mode 100644
index 00000000..30ade87c
--- /dev/null
+++ b/examples/android/src/main/java/io/github/g0dkar/qrcode/extra/QRCodeListDatasource.kt
@@ -0,0 +1,67 @@
+package io.github.g0dkar.qrcode.extra
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.appcompat.app.AppCompatActivity.MODE_PRIVATE
+import androidx.lifecycle.MutableLiveData
+import io.github.g0dkar.qrcode.QRCodeData
+import java.time.Instant
+import java.time.ZoneOffset
+
+object QRCodeListDatasource {
+    private const val ERROR = "ERROR"
+    private const val PREFERENCE_FILE = "qrCodeKotlinAndroidExample"
+
+    private lateinit var sharedPreferences: SharedPreferences
+
+    val liveData: MutableLiveData<List<QRCodeData>> = MutableLiveData(mutableListOf())
+
+    fun fromContext(context: Context) {
+        val currentList = liveData.value ?: listOf()
+        sharedPreferences = context.getSharedPreferences(PREFERENCE_FILE, MODE_PRIVATE)
+
+        val newList = currentList.toMutableList().apply {
+            sharedPreferences.all
+                .filterValues { it != null && it.toString().isNotBlank() }
+                .mapTo(this) { (key, value) ->
+                    QRCodeData(
+                        value?.toString() ?: ERROR,
+                        Instant.ofEpochSecond(key.toLong()).atOffset(ZoneOffset.UTC)
+                    )
+                }
+
+            if (isEmpty()) {
+                add(QRCodeData("QRCode Kotlin"))
+            }
+
+            sortDescending()
+        }
+
+        liveData.postValue(newList)
+    }
+
+    fun add(data: String) {
+        val currentList = liveData.value ?: listOf()
+        val qrCodeData = QRCodeData(data)
+
+        val editor = sharedPreferences.edit()
+        qrCodeData.persist(editor)
+        editor.apply()
+
+        val newList = currentList.toMutableList()
+            .apply { add(0, qrCodeData) }
+        liveData.postValue(newList)
+    }
+
+    fun remove(timestamp: Long) {
+        val currentList = liveData.value ?: listOf()
+        val newList = currentList.toMutableList()
+
+        newList.removeIf { it.timestamp.toEpochSecond() == timestamp }
+        sharedPreferences.edit()
+            .remove(timestamp.toString())
+            .apply()
+
+        liveData.postValue(newList)
+    }
+}
diff --git a/examples/android/src/main/res/drawable-v24/ic_launcher_foreground.xml b/examples/android/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 00000000..218bbd56
--- /dev/null
+++ b/examples/android/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:aapt="http://schemas.android.com/aapt"
+  android:height="108dp"
+  android:viewportHeight="108"
+  android:viewportWidth="108"
+  android:width="108dp">
+  <path
+    android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+        android:endX="85.84757"
+        android:endY="92.4963"
+        android:startX="42.9492"
+        android:startY="49.59793"
+        android:type="linear">
+        <item
+          android:color="#44000000"
+          android:offset="0.0"/>
+        <item
+          android:color="#00000000"
+          android:offset="1.0"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+    android:fillColor="#FFFFFF"
+    android:fillType="nonZero"
+    android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+    android:strokeColor="#00000000"
+    android:strokeWidth="1"/>
+</vector>
\ No newline at end of file
diff --git a/examples/android/src/main/res/layout/activity_about.xml b/examples/android/src/main/res/layout/activity_about.xml
new file mode 100644
index 00000000..1d341c89
--- /dev/null
+++ b/examples/android/src/main/res/layout/activity_about.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:paddingTop="@dimen/activity_vertical_margin"
+  android:paddingBottom="@dimen/activity_vertical_margin"
+  android:paddingLeft="@dimen/activity_horizontal_margin"
+  android:paddingRight="@dimen/activity_horizontal_margin"
+  tools:context=".AboutActivity">
+
+  <ImageView
+    android:id="@+id/imageView"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    tools:srcCompat="@tools:sample/avatars"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/examples/android/src/main/res/layout/activity_main.xml b/examples/android/src/main/res/layout/activity_main.xml
new file mode 100644
index 00000000..c494031f
--- /dev/null
+++ b/examples/android/src/main/res/layout/activity_main.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <com.google.android.material.appbar.MaterialToolbar
+    android:id="@+id/titleBar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/colorPrimary"
+    android:minHeight="?attr/actionBarSize"
+    android:theme="?attr/actionBarTheme"
+    android:contentDescription="@string/title"
+    app:title="@string/title"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:menu="@menu/menu_main"/>
+
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler_view"
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    app:layoutManager="LinearLayoutManager"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/titleBar"/>
+
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    android:id="@+id/fab"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="16dp"
+    android:contentDescription="@string/fab_content_description"
+    android:src="@android:drawable/ic_input_add"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/examples/android/src/main/res/layout/activity_new_qrcode.xml b/examples/android/src/main/res/layout/activity_new_qrcode.xml
new file mode 100644
index 00000000..c36a432b
--- /dev/null
+++ b/examples/android/src/main/res/layout/activity_new_qrcode.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:paddingTop="@dimen/activity_vertical_margin"
+  android:paddingBottom="@dimen/activity_vertical_margin"
+  android:paddingLeft="@dimen/activity_horizontal_margin"
+  android:paddingRight="@dimen/activity_horizontal_margin"
+  tools:context=".NewQRCodeActivity">
+
+  <Button
+    android:id="@+id/newQRCodeBtn"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="16dp"
+    android:layout_gravity="start"
+    android:contentDescription="@string/new_qrcode_btn"
+    android:enabled="true"
+    android:text="@string/new_qrcode_btn"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/newQRCodeData"/>
+  <EditText
+    android:id="@+id/newQRCodeData"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:autofillHints="@string/new_qrcode_qrcode_data_label"
+    android:hint="@string/new_qrcode_qrcode_data_label"
+    android:inputType="textUri"
+    android:minHeight="48dp"
+    android:selectAllOnFocus="true"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"/>
+  <ImageView
+    android:id="@+id/newQRCodePreviewImage"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="16dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/newQRCodeBtn"
+    tools:srcCompat="@tools:sample/avatars"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/examples/android/src/main/res/layout/activity_qrcode_detail.xml b/examples/android/src/main/res/layout/activity_qrcode_detail.xml
new file mode 100644
index 00000000..98022550
--- /dev/null
+++ b/examples/android/src/main/res/layout/activity_qrcode_detail.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:paddingTop="@dimen/activity_vertical_margin"
+  android:paddingBottom="@dimen/activity_vertical_margin"
+  android:paddingLeft="@dimen/activity_horizontal_margin"
+  android:paddingRight="@dimen/activity_horizontal_margin"
+  tools:context=".QRCodeDetailActivity">
+
+  <ImageView
+    android:id="@+id/qrCodeDetailImage"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="16dp"
+    app:layout_constraintBottom_toTopOf="@+id/qrCodeDetailText"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    tools:srcCompat="@tools:sample/avatars"/>
+  <TextView
+    android:id="@+id/qrCodeDetailText"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:autoLink="all"
+    android:autoSizeTextType="uniform"
+    android:ellipsize="marquee"
+    android:marqueeRepeatLimit="marquee_forever"
+    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"/>
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    android:id="@+id/qrCodeDetailFab"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    app:backgroundTint="@android:color/holo_red_light"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:srcCompat="@android:drawable/ic_menu_delete"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/examples/android/src/main/res/layout/qrcode_list_item.xml b/examples/android/src/main/res/layout/qrcode_list_item.xml
new file mode 100644
index 00000000..7007dacf
--- /dev/null
+++ b/examples/android/src/main/res/layout/qrcode_list_item.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2020 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content">
+
+  <ImageView
+    android:id="@+id/qrcode_image"
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:layout_margin="10dp"
+    android:contentDescription="@string/qrcode_image_description"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toStartOf="@+id/qrcode_data"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"/>
+
+  <TextView
+    android:id="@+id/qrcode_data"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="10dp"
+    android:autoSizeTextType="uniform"
+    android:ellipsize="marquee"
+    android:marqueeRepeatLimit="marquee_forever"
+    android:text="@string/qrcode_data_title"
+    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintStart_toEndOf="@+id/qrcode_image"
+    app:layout_constraintTop_toTopOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/examples/android/src/main/res/menu/menu_main.xml b/examples/android/src/main/res/menu/menu_main.xml
new file mode 100644
index 00000000..c9775790
--- /dev/null
+++ b/examples/android/src/main/res/menu/menu_main.xml
@@ -0,0 +1,11 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  tools:context="com.example.qrcodekotlinexampleapp.MainActivity">
+  <item
+    android:id="@+id/action_settings"
+    android:icon="@android:drawable/ic_menu_info_details"
+    android:orderInCategory="100"
+    android:title="@string/action_about"
+    app:showAsAction="ifRoom"/>
+</menu>
\ No newline at end of file
diff --git a/examples/android/src/main/res/values-pt-rBR/strings.xml b/examples/android/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 00000000..c30deda4
--- /dev/null
+++ b/examples/android/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="action_about">Sobre</string>
+  <string name="title">QRCode-Kotlin App de Exemplo</string>
+  <string name="qrcode_data_title">Dado do QRCode</string>
+  <string name="qrcode_image_description">Imagem do QRCode</string>
+  <string name="fab_content_description">Criar Novo QRCode</string>
+  <string name="new_qrcode_qrcode_data_label">Dados do QRCode (Link, Texto, etc.)</string>
+  <string name="new_qrcode_btn">Salvar QRCode</string>
+  <string name="new_qrcode_image_desc">Previsão do QRCode</string>
+  <string name="new_qrcode_error">Erro ao adicionar QRCode, por favor tente novamente.</string>
+  <string name="title_activity_new_qrcode">Novo QRCode</string>
+  <string name="new_qrcode_error_preview">Erro gerando previsão de QRCode :(</string>
+  <string name="title_activity_qrcode_detail">Informações do QRCode</string>
+  <string name="qrcode_detail_fab">Remover QRCode</string>
+</resources>
\ No newline at end of file
diff --git a/examples/android/src/main/res/xml/backup_rules.xml b/examples/android/src/main/res/xml/backup_rules.xml
new file mode 100644
index 00000000..7a180f46
--- /dev/null
+++ b/examples/android/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older that API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+  <!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+</full-backup-content>
\ No newline at end of file
diff --git a/examples/android/src/main/res/xml/data_extraction_rules.xml b/examples/android/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 00000000..84910a72
--- /dev/null
+++ b/examples/android/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+  <cloud-backup>
+    <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+  </cloud-backup>
+  <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
\ No newline at end of file
diff --git a/examples/java/src/main/java/examples/Example01_Shapes.java b/examples/java/src/main/java/examples/Example01_Shapes.java
index 875b61a8..164032d1 100644
--- a/examples/java/src/main/java/examples/Example01_Shapes.java
+++ b/examples/java/src/main/java/examples/Example01_Shapes.java
@@ -14,29 +14,29 @@ public static void main(String[] args) {
         // Squares (default)
         QRCode squareQRCode = QRCode.ofSquares() // <- See Here
                 .build("Hello, Squares!");
-        byte[] squarePngData = squareQRCode.render();
+        byte[] squarePngData = squareQRCode.renderToBytes();
 
         // Circles
         QRCode circleQRCode = QRCode.ofCircles() // <- See Here
                 .build("Hello, Circles!");
-        byte[] circlePngData = circleQRCode.render();
+        byte[] circlePngData = circleQRCode.renderToBytes();
 
         // Rounded Squares
         QRCode roundedSquareQRCode = QRCode.ofRoundedSquares() // <- See Here
                 .build("Hello, Rounded Squares!");
-        byte[] roundedSquarePngData = roundedSquareQRCode.render();
+        byte[] roundedSquarePngData = roundedSquareQRCode.renderToBytes();
 
         // Custom Shape
         // WARNING: For demonstration purposes only. My phone camera couldn't read it.
         QRCode customShapeQRCode = QRCode.ofCustomShape(new TriangleShapeFunction()) // <- See Here
                 .build("Hello, Triangles!");
-        byte[] customShapePngData = customShapeQRCode.render();
+        byte[] customShapePngData = customShapeQRCode.renderToBytes();
 
         // Custom Shape - JVM-specific implementation
         // WARNING: For demonstration purposes only. My phone camera couldn't read it.
         QRCode customShapeQRCodeJVM = QRCode.ofCustomShape(new JVMTriangleShapeFunction()) // <- See Here
                 .build("Hello, Triangles... from the JVM!");
-        byte[] customShapePngDataJVM = customShapeQRCodeJVM.render();
+        byte[] customShapePngDataJVM = customShapeQRCodeJVM.renderToBytes();
 
         // -----------------------
         // JVM-only code (saves the PNG Bytes to a file)
diff --git a/examples/java/src/main/java/examples/Example02_Colors.java b/examples/java/src/main/java/examples/Example02_Colors.java
index c148d793..3ffc44d8 100644
--- a/examples/java/src/main/java/examples/Example02_Colors.java
+++ b/examples/java/src/main/java/examples/Example02_Colors.java
@@ -14,27 +14,27 @@ public static void main(String[] args) {
         QRCode colorQRCode = QRCode.ofSquares()
                 .withColor(Colors.ORANGE) // <- See Here
                 .build("Orange");
-        byte[] colorPngData = colorQRCode.render();
+        byte[] colorPngData = colorQRCode.renderToBytes();
 
         // Circles
         QRCode darkModeQRCode = QRCode.ofSquares()
                 .withColor(Colors.css("#43454a"))           // <- See Here
                 .withBackgroundColor(Colors.css("#1e1f22")) // <- See Here
                 .build("Dark Mode QRCode");
-        byte[] darkModePngData = darkModeQRCode.render();
+        byte[] darkModePngData = darkModeQRCode.renderToBytes();
 
         // Rounded Squares
         QRCode gradientQRCode = QRCode.ofSquares()
                 .withGradientColor(Colors.BISQUE, Colors.BLUE) // <- See Here
                 .build("Weird gradient colors, but I think it's nice");
-        byte[] gradientPngData = gradientQRCode.render();
+        byte[] gradientPngData = gradientQRCode.renderToBytes();
 
         // Custom Shape
         // WARNING: For demonstration purposes only. My phone camera couldn't read it.
         QRCode transparentQRCode = QRCode.ofSquares()
                 .withBackgroundColor(Colors.TRANSPARENT)
                 .build("You can put this on top of pretty much anything :)");
-        byte[] transparentPngData = transparentQRCode.render();
+        byte[] transparentPngData = transparentQRCode.renderToBytes();
 
         // -----------------------
         // JVM-only code (saves the PNG Bytes to a file)
diff --git a/examples/java/src/main/java/examples/Example03_SVG.java b/examples/java/src/main/java/examples/Example03_SVG.java
index 7c3a33a4..0ba33bbd 100644
--- a/examples/java/src/main/java/examples/Example03_SVG.java
+++ b/examples/java/src/main/java/examples/Example03_SVG.java
@@ -14,19 +14,19 @@ public static void main(String[] args) {
         QRCode squareQRCode = QRCode.ofSquares()
                 .withGraphicsFactory(new SVGGraphicsFactory()) // <- See Here
                 .build("Hello, Squares!");
-        byte[] squarePngData = squareQRCode.render();
+        byte[] squarePngData = squareQRCode.renderToBytes();
 
         // Circles
         QRCode circleQRCode = QRCode.ofCircles()
                 .withGraphicsFactory(new SVGGraphicsFactory()) // <- See Here
                 .build("Hello, Circles!");
-        byte[] circlePngData = circleQRCode.render();
+        byte[] circlePngData = circleQRCode.renderToBytes();
 
         // Rounded Squares
         QRCode roundedSquareQRCode = QRCode.ofRoundedSquares()
                 .withGraphicsFactory(new SVGGraphicsFactory()) // <- See Here
                 .build("Hello, Rounded Squares!");
-        byte[] roundedSquarePngData = roundedSquareQRCode.render();
+        byte[] roundedSquarePngData = roundedSquareQRCode.renderToBytes();
 
         // -----------------------
         // JVM-only code (saves the SVG to a file)
diff --git a/examples/kotlin/src/main/kotlin/Example01-Shapes.kt b/examples/kotlin/src/main/kotlin/Example01-Shapes.kt
index 140bf336..a3cd1b36 100644
--- a/examples/kotlin/src/main/kotlin/Example01-Shapes.kt
+++ b/examples/kotlin/src/main/kotlin/Example01-Shapes.kt
@@ -13,29 +13,29 @@ fun main() {
     // Squares (default)
     val squareQRCode = QRCode.ofSquares() // <- See Here
         .build("Hello, Squares!")
-    val squarePngData = squareQRCode.render()
+    val squarePngData = squareQRCode.renderToBytes()
 
     // Circles
     val circleQRCode = QRCode.ofCircles() // <- See Here
         .build("Hello, Circles!")
-    val circlePngData = circleQRCode.render()
+    val circlePngData = circleQRCode.renderToBytes()
 
     // Rounded Squares
     val roundedSquareQRCode = QRCode.ofRoundedSquares() // <- See Here
         .build("Hello, Rounded Squares!")
-    val roundedSquarePngData = roundedSquareQRCode.render()
+    val roundedSquarePngData = roundedSquareQRCode.renderToBytes()
 
     // Custom Shape
     // WARNING: For demonstration purposes only. My phone camera couldn't read it.
     val customShapeQRCode = QRCode.ofCustomShape(TriangleShapeFunction()) // <- See Here
         .build("Hello, Triangles!")
-    val customShapePngData = customShapeQRCode.render()
+    val customShapePngData = customShapeQRCode.renderToBytes()
 
     // Custom Shape - JVM-specific implementation
     // WARNING: For demonstration purposes only. My phone camera couldn't read it.
     val customShapeQRCodeJVM = QRCode.ofCustomShape(JVMTriangleShapeFunction()) // <- See Here
         .build("Hello, Triangles... from the JVM!")
-    val customShapePngDataJVM = customShapeQRCodeJVM.render()
+    val customShapePngDataJVM = customShapeQRCodeJVM.renderToBytes()
 
     // -----------------------
     // JVM-only code (saves the PNG Bytes to a file)
@@ -50,7 +50,7 @@ class TriangleShapeFunction(
     squareSize: Int = QRCodeProcessor.DEFAULT_CELL_SIZE,
     innerSpace: Int = 1,
 ) : DefaultShapeFunction(squareSize, innerSpace) {
-    override fun fillRect(x: Int, y: Int, width: Int, height: Int, color: Int, canvas: QRCodeGraphics) {
+    override fun fillRect(x: Int, y: Int, width: Int, height: Int, color: Long, canvas: QRCodeGraphics) {
         val topCenterX = x + width / 2
         val topCenterY = y
         val bottomLeftX = x
@@ -74,7 +74,7 @@ class JVMTriangleShapeFunction(
     squareSize: Int = QRCodeProcessor.DEFAULT_CELL_SIZE,
     innerSpace: Int = 1,
 ) : DefaultShapeFunction(squareSize, innerSpace) {
-    override fun fillRect(x: Int, y: Int, width: Int, height: Int, color: Int, canvas: QRCodeGraphics) {
+    override fun fillRect(x: Int, y: Int, width: Int, height: Int, color: Long, canvas: QRCodeGraphics) {
         val topCenterX = x + width / 2
         val topCenterY = y
         val bottomLeftX = x
diff --git a/examples/kotlin/src/main/kotlin/Example02-Colors.kt b/examples/kotlin/src/main/kotlin/Example02-Colors.kt
index eb4057c6..ca0c9df9 100644
--- a/examples/kotlin/src/main/kotlin/Example02-Colors.kt
+++ b/examples/kotlin/src/main/kotlin/Example02-Colors.kt
@@ -9,26 +9,26 @@ fun main() {
     val orangeQRCode = QRCode.ofSquares()
         .withColor(Colors.ORANGE) // <- See Here
         .build("Orange")
-    val orangePngData = orangeQRCode.render()
+    val orangePngData = orangeQRCode.renderToBytes()
 
     // Changing both background and foreground
     val darkModeQRCode = QRCode.ofSquares()
         .withColor(Colors.css("#43454a"))           // <- See Here
         .withBackgroundColor(Colors.css("#1e1f22")) // <- See Here
         .build("Dark Mode QRCode")
-    val darkModePngData = darkModeQRCode.render()
+    val darkModePngData = darkModeQRCode.renderToBytes()
 
     // Have the squares be a linear gradient from a color to another
     val gradientQRCode = QRCode.ofSquares()
         .withGradientColor(Colors.BISQUE, Colors.BLUE) // <- See Here
         .build("Weird gradient colors, but I think it's nice")
-    val gradientPngData = gradientQRCode.render()
+    val gradientPngData = gradientQRCode.renderToBytes()
 
     // Use "transparent" as a background color (meaning basically no background)
     val transparentQRCode = QRCode.ofSquares()
         .withBackgroundColor(Colors.TRANSPARENT)
         .build("You can put this on top of pretty much anything :)")
-    val transparentPngData = transparentQRCode.render()
+    val transparentPngData = transparentQRCode.renderToBytes()
 
     // -----------------------
     // JVM-only code (saves the PNG Bytes to a file)
diff --git a/examples/kotlin/src/main/kotlin/Example03-Logo.kt b/examples/kotlin/src/main/kotlin/Example03-Logo.kt
index c3c408b8..d2b32be3 100644
--- a/examples/kotlin/src/main/kotlin/Example03-Logo.kt
+++ b/examples/kotlin/src/main/kotlin/Example03-Logo.kt
@@ -13,13 +13,13 @@ fun main() {
     val logoQRCode = QRCode.ofCircles()
         .withLogo(logoBytes, 150, 150) // <- See Here --- Default: Will hide cells behind logo
         .build("BOO!!! Happy Halloween!")
-    val logoQRCodePngData = logoQRCode.render()
+    val logoQRCodePngData = logoQRCode.renderToBytes()
 
     // Simply add a logo image
     val transparentQRCode = QRCode.ofCircles()
         .withLogo(logoBytes, 150, 150, clearLogoArea = false) // <- See Here --- Keep cells behind logo
         .build("BOO!!! Happy Halloween!")
-    val transparentQRCodePngData = transparentQRCode.render()
+    val transparentQRCodePngData = transparentQRCode.renderToBytes()
 
     // ---------------------------
     // JVM-only code (saves the PNG Bytes to a file)
diff --git a/examples/kotlin/src/main/kotlin/Example04-SVG.kt b/examples/kotlin/src/main/kotlin/Example04-SVG.kt
index 282a4832..07867551 100644
--- a/examples/kotlin/src/main/kotlin/Example04-SVG.kt
+++ b/examples/kotlin/src/main/kotlin/Example04-SVG.kt
@@ -12,19 +12,19 @@ fun main() {
     val squareQRCode = QRCode.ofSquares()
         .withGraphicsFactory(SVGGraphicsFactory()) // <- See Here --- Feel free to copy/paste and use these classes ^^
         .build("Hello, Squares! (you are reading an SVG!)")
-    val squarePngData = squareQRCode.render()
+    val squarePngData = squareQRCode.renderToBytes()
 
     // Circles
     val circleQRCode = QRCode.ofCircles()
         .withGraphicsFactory(SVGGraphicsFactory()) // <- See Here --- Feel free to copy/paste and use these classes ^^
         .build("Hello, Circles! (you are reading an SVG!)")
-    val circlePngData = circleQRCode.render()
+    val circlePngData = circleQRCode.renderToBytes()
 
     // Rounded Squares
     val roundedSquareQRCode = QRCode.ofRoundedSquares()
         .withGraphicsFactory(SVGGraphicsFactory()) // <- See Here --- Feel free to copy/paste and use these classes ^^
         .build("Hello, Rounded Squares! (you are reading an SVG!)")
-    val roundedSquarePngData = roundedSquareQRCode.render()
+    val roundedSquarePngData = roundedSquareQRCode.renderToBytes()
 
     // -----------------------
     // JVM-only code (saves the PNG Bytes to a file)
diff --git a/examples/kotlin/src/main/kotlin/Example05-BackwardsCompat.kt b/examples/kotlin/src/main/kotlin/Example05-BackwardsCompat.kt
new file mode 100644
index 00000000..774bd61b
--- /dev/null
+++ b/examples/kotlin/src/main/kotlin/Example05-BackwardsCompat.kt
@@ -0,0 +1,16 @@
+import qrcode.QRCode
+import java.awt.image.BufferedImage
+import java.io.FileOutputStream
+import javax.imageio.ImageIO
+
+fun main() {
+    // All supported platforms
+    // -----------------------
+    // Default rendering
+    val defaultRenderQRCode = QRCode("Hello, processor!").render()
+    val defaultRenderPngData = defaultRenderQRCode.nativeImage() as BufferedImage
+
+    // -----------------------
+    // JVM-only code (saves the PNG Bytes to a file)
+    ImageIO.write(defaultRenderPngData, "PNG", FileOutputStream("examples/kotlin/example05-defaults.png"))
+}
diff --git a/examples/kotlin/src/main/kotlin/ProjectLogo.kt b/examples/kotlin/src/main/kotlin/ProjectLogo.kt
index 2231aea6..192b397d 100644
--- a/examples/kotlin/src/main/kotlin/ProjectLogo.kt
+++ b/examples/kotlin/src/main/kotlin/ProjectLogo.kt
@@ -26,7 +26,7 @@ fun main() {
     }
 
     // And render the QRCode on top of the Gradient :)
-    val qrCodeLogoPngData = qrCode.render()
+    val qrCodeLogoPngData = qrCode.renderToBytes()
 
     // Now to create the Banner...
     // We reset all the rendering done so far
@@ -43,7 +43,7 @@ fun main() {
     }
 
     // Draw the QRCode on our banner canvas
-    qrCode.renderToGraphics(banner, (w - qrCode.computedSize) / 2, (h - qrCode.computedSize) / 2)
+    qrCode.render(banner, (w - qrCode.computedSize) / 2, (h - qrCode.computedSize) / 2)
 
     // Get the bytes to save it to a file :)
     val pngData = banner.getBytes()
diff --git a/gradle.properties b/gradle.properties
index a4d747c6..bbdb4bfc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,8 +9,10 @@ kotlin.js.ir.output.granularity=whole-program
 android.useAndroidX=true
 
 # MPP
+kotlin.js.compiler=ir
 kotlin.native.cacheKind=none
 kotlin.native.ignoreDisabledTargets=true
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 07884ab9..eb4ff6ee 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.20"
+kotlin = "1.8.22"
 coroutines = "1.8.21"
 dokka = "1.9.10"
 kotest = "5.8.0"
@@ -8,6 +8,15 @@ mavenNexus = "1.3.0"
 ktlint = "0.48.2"
 androidPlugin = "8.1.2"
 npmPublish = "3.4.1"
+core-ktx = "1.9.0"
+junit = "4.13.2"
+androidx-test-ext-junit = "1.1.5"
+espresso-core = "3.5.1"
+appcompat = "1.6.1"
+material = "1.7.0"
+constraintlayout = "2.1.4"
+navigation-fragment-ktx = "2.5.3"
+navigation-ui-ktx = "2.5.3"
 
 [libraries]
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -15,6 +24,15 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c
 kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
 kotest-framework-engine = { module = "io.kotest:kotest-framework-engine", version.ref = "kotest" }
 kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
+core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
+espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
+appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigation-fragment-ktx" }
+navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigation-ui-ktx" }
 
 [plugins]
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
@@ -24,3 +42,5 @@ kotest-multiplatform = { id = "io.kotest.multiplatform", version.ref = "kotest"
 android-library = { id = "com.android.library", version.ref = "androidPlugin" }
 nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "mavenNexus" }
 npmPublish = { id = "dev.petuska.npm.publish", version.ref = "npmPublish" }
+android-application = { id = "com.android.application", version.ref = "androidPlugin" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8d8587ef..b78efc7f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -25,4 +25,4 @@ pluginManagement {
 rootProject.name = "qrcode-kotlin"
 
 // Examples
-include("examples:kotlin", "examples:java")
+include("examples:kotlin", "examples:java", "examples:android")
diff --git a/src/androidMain/kotlin/qrcode/render/QRCodeGraphics.android.kt b/src/androidMain/kotlin/qrcode/render/QRCodeGraphics.android.kt
index 79b8ac98..b514917a 100644
--- a/src/androidMain/kotlin/qrcode/render/QRCodeGraphics.android.kt
+++ b/src/androidMain/kotlin/qrcode/render/QRCodeGraphics.android.kt
@@ -12,36 +12,39 @@ import android.graphics.Paint.Style
 import android.graphics.Paint.Style.FILL
 import android.graphics.Paint.Style.STROKE
 import android.graphics.Rect
+import android.util.Log
 import java.io.ByteArrayOutputStream
 import java.io.OutputStream
+import kotlin.math.roundToInt
 
 @Suppress("MemberVisibilityCanBePrivate")
 actual open class QRCodeGraphics actual constructor(
     val width: Int,
-    val height: Int
+    val height: Int,
 ) {
     companion object {
-        val AVAILABLE_FORMATS: Array<String> = CompressFormat.entries.map { it.name }.toTypedArray()
+        val AVAILABLE_FORMATS: Array<String> = CompressFormat.values().map { it.name }.toTypedArray()
     }
 
     protected fun createCanvas(image: Bitmap) = Canvas(image)
 
     private var image: Bitmap = Bitmap.createBitmap(width, height, ARGB_8888)
     private var canvas: Canvas = createCanvas(image)
-    private val paintCache = HashMap<Int, Paint>()
+    private val paintCache = mutableMapOf<Int, Paint>()
     private var changed: Boolean = false
 
     /**
-     * Keeps a simple color cache. The default style is [STROKE]. Use [FILL] if you intend to fill an area of the image.
+     * Keeps a simple color cache. The default style is [FILL].
      */
-    protected fun paintFromCache(color: Int, paintStyle: Style = STROKE): Paint {
+    protected fun paintFromCache(color: Int, paintStyle: Style = FILL, thickness: Double = 1.0): Paint {
         changed = true
-        val paint = paintCache.computeIfAbsent(color) { Paint().apply { setColor(color) } }
-
-        return paint.apply {
+        return paintCache.getOrPut(color) {
+            Paint().apply { setColor(color) }
+        }.apply {
             if (style != paintStyle) {
                 style = paintStyle
             }
+            this.strokeWidth = thickness.toFloat()
         }
     }
 
@@ -119,17 +122,21 @@ actual open class QRCodeGraphics actual constructor(
 
     /** Draw a straight line from point `(x1,y1)` to `(x2,y2)`. */
     actual open fun drawLine(x1: Int, y1: Int, x2: Int, y2: Int, color: Int, thickness: Double) {
-        canvas.drawLine(x1.toFloat(), y1.toFloat(), x2.toFloat(), y2.toFloat(), paintFromCache(color))
+        Log.i("graphics", "[drawLine] x1=$x1, y1=$y1, x2=$x2, y2=$y2, color=$color, thickness=$thickness")
+        canvas.drawLine(x1.toFloat(), y1.toFloat(), x2.toFloat(), y2.toFloat(), paintFromCache(color, STROKE, thickness))
     }
 
     /** Draw the edges of a rectangle starting at point `(x,y)` and having `width` by `height`. */
     actual open fun drawRect(x: Int, y: Int, width: Int, height: Int, color: Int, thickness: Double) {
-        canvas.drawRect(Rect(x, y, width, height), paintFromCache(color))
+        Log.i("graphics", "[drawRect] x=$x, y=$y, width=$width, height=$height, color=$color, thickness=$thickness")
+        val halfThickness = (thickness / 2.0).roundToInt()
+        val rect = Rect(x + halfThickness, y + halfThickness, x + width - halfThickness, y + height - halfThickness)
+        canvas.drawRect(rect, paintFromCache(color, STROKE, thickness))
     }
 
     /** Fills the rectangle starting at point `(x,y)` and having `width` by `height`. */
     actual open fun fillRect(x: Int, y: Int, width: Int, height: Int, color: Int) {
-        canvas.drawRect(Rect(x, y, width, height), paintFromCache(color, FILL))
+        canvas.drawRect(Rect(x, y, x + width, y + height), paintFromCache(color))
     }
 
     /** Fill the whole area of this canvas with the specified [color]. */
@@ -165,16 +172,17 @@ actual open class QRCodeGraphics actual constructor(
         height: Int,
         borderRadius: Int,
         color: Int,
-        thickness: Double
+        thickness: Double,
     ) {
+        Log.i("graphics", "[drawRoundRect] x=$x, y=$y, width=$width, height=$height, borderRadius=$borderRadius, color=$color, thickness=$thickness")
         canvas.drawRoundRect(
             x.toFloat(),
             y.toFloat(),
-            width.toFloat(),
-            height.toFloat(),
+            (x + width).toFloat(),
+            (y + height).toFloat(),
             borderRadius.toFloat(),
             borderRadius.toFloat(),
-            paintFromCache(color)
+            paintFromCache(color, STROKE, thickness),
         )
     }
 
@@ -200,14 +208,15 @@ actual open class QRCodeGraphics actual constructor(
      *
      */
     actual open fun fillRoundRect(x: Int, y: Int, width: Int, height: Int, borderRadius: Int, color: Int) {
+        Log.i("graphics", "[fillRoundRect] x=$x, y=$y, width=$width, height=$height, borderRadius=$borderRadius, color=$color")
         canvas.drawRoundRect(
             x.toFloat(),
             y.toFloat(),
-            width.toFloat(),
-            height.toFloat(),
+            (x + width).toFloat(),
+            (y + height).toFloat(),
             borderRadius.toFloat(),
             borderRadius.toFloat(),
-            paintFromCache(color, FILL)
+            paintFromCache(color),
         )
     }
 
@@ -215,12 +224,13 @@ actual open class QRCodeGraphics actual constructor(
      * Draw the edges of an ellipse (aka "a circle") which occupies the area `(x,y,width,height)`
      */
     actual fun drawEllipse(x: Int, y: Int, width: Int, height: Int, color: Int, thickness: Double) {
+        Log.i("graphics", "[drawEllipse] x=$x, y=$y, width=$width, height=$height, color=$color, thickness=$thickness")
         canvas.drawOval(
             x.toFloat(),
             y.toFloat(),
-            width.toFloat(),
-            height.toFloat(),
-            paintFromCache(color)
+            (x + width).toFloat(),
+            (y + height).toFloat(),
+            paintFromCache(color, STROKE, thickness),
         )
     }
 
@@ -229,12 +239,13 @@ actual open class QRCodeGraphics actual constructor(
      *
      */
     actual fun fillEllipse(x: Int, y: Int, width: Int, height: Int, color: Int) {
+        Log.i("graphics", "[fillEllipse] x=$x, y=$y, width=$width, height=$height, color=$color")
         canvas.drawOval(
             x.toFloat(),
             y.toFloat(),
-            width.toFloat(),
-            height.toFloat(),
-            paintFromCache(color, FILL)
+            (x + width).toFloat(),
+            (y + height).toFloat(),
+            paintFromCache(color),
         )
     }
 
diff --git a/src/commonMain/kotlin/qrcode/QRCode.kt b/src/commonMain/kotlin/qrcode/QRCode.kt
index 497253f3..eca66104 100644
--- a/src/commonMain/kotlin/qrcode/QRCode.kt
+++ b/src/commonMain/kotlin/qrcode/QRCode.kt
@@ -54,7 +54,7 @@ class QRCode @JvmOverloads constructor(
     val data: String,
     val squareSize: Int = DEFAULT_SQUARE_SIZE,
     val colorFn: QRCodeColorFunction = DefaultColorFunction(),
-    val shapeFn: QRCodeShapeFunction = DefaultShapeFunction(squareSize),
+    val shapeFn: QRCodeShapeFunction = DefaultShapeFunction(squareSize, innerSpace = 0),
     var graphicsFactory: QRCodeGraphicsFactory = QRCodeGraphicsFactory(),
     private val doBefore: QRCode.(QRCodeGraphics, Int, Int) -> Unit = EMPTY_FN,
     private val doAfter: QRCode.(QRCodeGraphics, Int, Int) -> Unit = EMPTY_FN,
@@ -146,21 +146,21 @@ class QRCode @JvmOverloads constructor(
 
     /** Executes all the drawing of the QRCode and returns the [QRCodeGraphics] of the complete QRCode. */
     @JvmOverloads
-    fun renderToGraphics(qrCodeGraphics: QRCodeGraphics = graphics, xOffset: Int = 0, yOffset: Int = 0): QRCodeGraphics {
+    fun render(qrCodeGraphics: QRCodeGraphics = graphics, xOffset: Int = 0, yOffset: Int = 0): QRCodeGraphics {
         colorFn.beforeRender(this, qrCodeGraphics)
         shapeFn.beforeRender(this, qrCodeGraphics)
         doBefore(qrCodeGraphics, xOffset, yOffset)
         return draw(xOffset, yOffset, rawData, qrCodeGraphics).also { doAfter(it, xOffset, yOffset) }
     }
 
-    /** Calls [renderToGraphics] and then returns the bytes of a [format] (default = PNG) render of the QRCode. */
+    /** Calls [render] and then returns the bytes of a [format] (default = PNG) render of the QRCode. */
     @JvmOverloads
-    fun render(format: String = "PNG"): ByteArray {
-        return renderToGraphics().getBytes(format)
+    fun renderToBytes(format: String = "PNG"): ByteArray {
+        return render().getBytes(format)
     }
 
     /**
-     * Completely resets the QRCode drawing. After this, you can call [render] or [renderToGraphics] to redraw the
+     * Completely resets the QRCode drawing. After this, you can call [renderToBytes] or [render] to redraw the
      * whole QRCode. Useful when you want, for example, a transparent background QRCode to add to a larger image and
      * then the same QRCode drawn on top of a custom background.
      */
diff --git a/src/commonMain/kotlin/qrcode/QRCodeBuilder.kt b/src/commonMain/kotlin/qrcode/QRCodeBuilder.kt
index 644bc5fb..47e5eb7b 100644
--- a/src/commonMain/kotlin/qrcode/QRCodeBuilder.kt
+++ b/src/commonMain/kotlin/qrcode/QRCodeBuilder.kt
@@ -250,8 +250,8 @@ class QRCodeBuilder @JvmOverloads constructor(
     /**
      * Builds a [QRCode] instance ready to use.
      *
+     * @see QRCode.renderToBytes
      * @see QRCode.render
-     * @see QRCode.renderToGraphics
      */
     fun build(data: String) =
         QRCode(
diff --git a/src/commonMain/kotlin/qrcode/color/ColorType.kt b/src/commonMain/kotlin/qrcode/color/ColorType.kt
new file mode 100644
index 00000000..b96caf37
--- /dev/null
+++ b/src/commonMain/kotlin/qrcode/color/ColorType.kt
@@ -0,0 +1,3 @@
+package qrcode.color
+
+typealias ColorType = Int
diff --git a/src/jvmMain/kotlin/qrcode/render/QRCodeGraphics.jvm.kt b/src/jvmMain/kotlin/qrcode/render/QRCodeGraphics.jvm.kt
index 2a6619c8..5491adb3 100644
--- a/src/jvmMain/kotlin/qrcode/render/QRCodeGraphics.jvm.kt
+++ b/src/jvmMain/kotlin/qrcode/render/QRCodeGraphics.jvm.kt
@@ -21,7 +21,6 @@ actual open class QRCodeGraphics actual constructor(
     private lateinit var image: BufferedImage
     private val colorCache = HashMap<Int, Color>()
     private var changed: Boolean = false
-//    private var nextDrawPaint: Paint? = null
 
     protected open fun createImage(force: Boolean = false): BufferedImage {
         if (force || !this::image.isInitialized) {
diff --git a/src/jvmTest/kotlin/qrcode/raw/QRCodeProcessorTest.kt b/src/jvmTest/kotlin/qrcode/raw/QRCodeProcessorTest.kt
new file mode 100644
index 00000000..aee900ea
--- /dev/null
+++ b/src/jvmTest/kotlin/qrcode/raw/QRCodeProcessorTest.kt
@@ -0,0 +1,62 @@
+package qrcode.raw
+
+import org.junit.jupiter.api.Test
+
+class QRCodeProcessorTest {
+
+    @Test
+    fun computeImageSize() {
+    }
+
+    @Test
+    fun render() {
+    }
+
+    @Test
+    fun testRender() {
+    }
+
+    @Test
+    fun testRender1() {
+    }
+
+    @Test
+    fun testRender2() {
+    }
+
+    @Test
+    fun testRender3() {
+    }
+
+    @Test
+    fun testRender4() {
+    }
+
+    @Test
+    fun testRender5() {
+    }
+
+    @Test
+    fun testRender6() {
+    }
+
+    @Test
+    fun renderShaded() {
+    }
+
+    @Test
+    fun testRenderShaded() {
+    }
+
+    @Test
+    fun testRenderShaded1() {
+    }
+
+    @Test
+    fun testRenderShaded2() {
+    }
+
+    @Test
+    fun testRenderShaded3() {
+    }
+}