From d4cee941ef457a411365472d05bd8141fae815d8 Mon Sep 17 00:00:00 2001
From: maxmoney21m <maxmoney@nostrplebs.com>
Date: Sat, 11 Mar 2023 01:22:23 +0800
Subject: [PATCH] Fix inverted QR scan

---
 .../com/vitorpamplona/amethyst/ui/qrcode/QrCodeDrawer.kt     | 5 +++--
 .../com/vitorpamplona/amethyst/ui/qrcode/QrCodeScanner.kt    | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeDrawer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeDrawer.kt
index e01e94b19..ac9669c6f 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeDrawer.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeDrawer.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -33,13 +34,13 @@ fun QrCodeDrawer(contents: String, modifier: Modifier = Modifier) {
         createQrCode(contents = contents)
     }
 
-    val foregroundColor = Color.Black
+    val foregroundColor = MaterialTheme.colors.onSurface
 
     Box(
         modifier = modifier
             .defaultMinSize(48.dp, 48.dp)
             .aspectRatio(1f)
-            .background(Color.White)
+            .background(MaterialTheme.colors.background)
     ) {
         Canvas(modifier = Modifier.fillMaxSize()) {
             // Calculate the height and width of each column/row
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeScanner.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeScanner.kt
index 086ca2ef5..5be23dc40 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeScanner.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeScanner.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
+import com.google.zxing.client.android.Intents
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanOptions
 import com.vitorpamplona.amethyst.R
@@ -48,6 +49,7 @@ fun QrCodeScanner(onScan: (String?) -> Unit) {
         setPrompt(stringResource(id = R.string.point_to_the_qr_code))
         setBeepEnabled(false)
         setOrientationLocked(false)
+        addExtra(Intents.Scan.SCAN_TYPE, Intents.Scan.MIXED_SCAN)
     }
 
     DisposableEffect(lifecycleOwner) {