nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix inverted QR scan

Browse Source
This commit is contained in:
maxmoney21m
2023-03-11 01:22:23 +08:00
parent ae6cf15768
commit d4cee941ef
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeDrawer.kt
+3 -2
View File
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.defaultMinSize import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
@@ -33,13 +34,13 @@ fun QrCodeDrawer(contents: String, modifier: Modifier = Modifier) {
createQrCode(contents = contents) createQrCode(contents = contents)
} }
val foregroundColor = Color.Black val foregroundColor = MaterialTheme.colors.onSurface
Box( Box(
modifier = modifier modifier = modifier
.defaultMinSize(48.dp, 48.dp) .defaultMinSize(48.dp, 48.dp)
.aspectRatio(1f) .aspectRatio(1f)
.background(Color.White) .background(MaterialTheme.colors.background)
) { ) {
Canvas(modifier = Modifier.fillMaxSize()) { Canvas(modifier = Modifier.fillMaxSize()) {
// Calculate the height and width of each column/row // Calculate the height and width of each column/row
app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeScanner.kt
+2
View File
@@ -5,6 +5,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.DisposableEffect
import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import com.google.zxing.client.android.Intents
import com.journeyapps.barcodescanner.ScanContract import com.journeyapps.barcodescanner.ScanContract
import com.journeyapps.barcodescanner.ScanOptions import com.journeyapps.barcodescanner.ScanOptions
import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.R
@@ -48,6 +49,7 @@ fun QrCodeScanner(onScan: (String?) -> Unit) {
setPrompt(stringResource(id = R.string.point_to_the_qr_code)) setPrompt(stringResource(id = R.string.point_to_the_qr_code))
setBeepEnabled(false) setBeepEnabled(false)
setOrientationLocked(false) setOrientationLocked(false)
addExtra(Intents.Scan.SCAN_TYPE, Intents.Scan.MIXED_SCAN)
} }
DisposableEffect(lifecycleOwner) { DisposableEffect(lifecycleOwner) {